Mercurial > kallithea
changeset 7528:0b942d34e4de
Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.
Translation: Kallithea/Development
Translate-URL: https://hosted.weblate.org/projects/kallithea/kallithea/
| author | Hosted Weblate <hosted@weblate.org> |
|---|---|
| date | Wed, 30 Jan 2019 11:14:21 +0100 |
| parents | 47a8dbf1bcce |
| children | 2bb58ce6adbf |
| files | kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po kallithea/i18n/uk/LC_MESSAGES/kallithea.po |
| diffstat | 2 files changed, 3663 insertions(+), 4981 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Wed Jan 30 11:12:23 2019 +0100 +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Wed Jan 30 11:14:21 2019 +0100 @@ -18,7 +18,6 @@ #: kallithea/controllers/changelog.py:86 #: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 msgid "There are no changesets yet" msgstr "Ingen endringssett enda" @@ -32,41 +31,29 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 #: kallithea/tests/data/templates/base/perms_summary.html.py:57 -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 msgid "None" msgstr "Ingen" #: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(lukket)" -#: kallithea/controllers/changeset.py:85 kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Vis blanktegn" #: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 #: kallithea/templates/files/diff_2way.html:53 -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 -#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer blanktegn" #: kallithea/controllers/changeset.py:165 -#: kallithea/controllers/changeset.py:169 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Øk diff-bindeleddsinformasjon til %(num)s linjer" #: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 #: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 -#: 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 "En slik revisjon funnes ikke for denne pakkebrønnen" @@ -91,43 +78,37 @@ msgid "Multiple merge ancestors found for merge compare" msgstr "" -#: kallithea/controllers/compare.py:262 kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "Kan ikke sammenligne pakkebrønner uten bruk av felles opphav" -#: kallithea/controllers/error.py:70 kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Ingen respons" -#: kallithea/controllers/error.py:71 kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Ukjent feil" -#: kallithea/controllers/error.py:84 kallithea/controllers/error.py:100 -msgid "" -"The request could not be understood by the server due to malformed syntax." -msgstr "" -"Forespørselen kunne ikke forstås av tjeneren som følge av feilaktig syntaks." - -#: kallithea/controllers/error.py:87 kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "Forespørselen kunne ikke forstås av tjeneren som følge av feilaktig syntaks." + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Uautorisert tilgang til ressurs" -#: kallithea/controllers/error.py:89 kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Du har ikke tilgang til å se denne siden" -#: kallithea/controllers/error.py:91 kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Kunne ikke finne ressursen" -#: kallithea/controllers/error.py:93 kallithea/controllers/error.py:109 -msgid "" -"The server encountered an unexpected condition which prevented it from " -"fulfilling the request." -msgstr "" -"Tjeneren støtte på en uventet tilstand som forhindret utøvelse av " -"forespørsel." +#: kallithea/controllers/error.py:93 +msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." +msgstr "Tjeneren støtte på en uventet tilstand som forhindret utøvelse av forespørsel." #: kallithea/controllers/feed.py:80 #: kallithea/templates/changeset/changeset.html:176 @@ -142,123 +123,112 @@ #: kallithea/tests/data/templates/compare/compare_diff.html.py:195 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Changeset was too big and was cut off..." msgstr "Endringsettet var for stort og har blitt avskåret…" -#: kallithea/controllers/feed.py:84 kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:84 #, python-format msgid "%s committed on %s" msgstr "%s sendte inn %s" #: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 -#: kallithea/controllers/feed.py:56 #, fuzzy, python-format msgid "%s %s feed" msgstr "%s %s kilde" #: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 -#: kallithea/controllers/feed.py:55 #, fuzzy, python-format msgid "Changes on %s repository" msgstr "Endringer i %s-pakkebrønn" -#: kallithea/controllers/files.py:93 kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Klikk her for å legge til ny fil" -#: kallithea/controllers/files.py:94 kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Ingen filer enda. %s" -#: kallithea/controllers/files.py:191 kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:191 #, fuzzy, python-format msgid "%s at %s" msgstr "%s den %s" #: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 -#: kallithea/controllers/files.py:424 kallithea/controllers/files.py:305 -#: kallithea/controllers/files.py:365 kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Denne pakkebrønnen har blitt påst av %s den %s" -#: kallithea/controllers/files.py:309 kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:309 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "Du kan bare slette filer med en revisjon som er en gyldig forgrening" -#: kallithea/controllers/files.py:320 kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Slettet filen %s via Kallithea" -#: kallithea/controllers/files.py:342 kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Filen %s ble slettet" #: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 -#: kallithea/controllers/files.py:493 kallithea/controllers/files.py:354 -#: kallithea/controllers/files.py:420 kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Feil inntraff under innsendelse" -#: kallithea/controllers/files.py:369 kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "Du kan bare redigere filer med en revisjon som er en gyldig avgrening" -#: kallithea/controllers/files.py:383 kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Filen %s ble endret via Kallithea" -#: kallithea/controllers/files.py:399 kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Ingen endringer" #: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 #, python-format msgid "Successfully committed to %s" msgstr "Innsendt til %s" -#: kallithea/controllers/files.py:435 kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Fil lagt til via Kallithea" -#: kallithea/controllers/files.py:456 kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Inget innhold" -#: kallithea/controllers/files.py:460 kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Inget filnavn" -#: kallithea/controllers/files.py:485 kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "Plasseringen må være en relativ sti, og kan ikke inneholde .. i stien" -#: kallithea/controllers/files.py:517 kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:517 msgid "Downloads disabled" msgstr "Nedlastinger avskrudd" -#: kallithea/controllers/files.py:528 kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:528 #, python-format msgid "Unknown revision %s" msgstr "Ukjent revisjon %s" -#: kallithea/controllers/files.py:530 kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Tom pakkebrønn" -#: kallithea/controllers/files.py:532 kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Ukjent arkivtype" @@ -270,34 +240,25 @@ #: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 #: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 -#: kallithea/controllers/files.py:771 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Endringssett" #: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 -#: kallithea/model/scm.py:705 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 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Forgreninger" #: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 -#: kallithea/model/scm.py:716 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 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Etiketter" -#: kallithea/controllers/forks.py:176 kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "En uventet feil inntraff under forgrening av pakkebrønnen %s" -#: kallithea/controllers/home.py:77 kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Grupper" @@ -317,12 +278,6 @@ #: kallithea/tests/data/templates/base/base.html.py:325 #: kallithea/tests/data/templates/base/base.html.py:654 #: kallithea/tests/data/templates/base/base.html.py:690 -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 msgid "Repositories" msgstr "Pakkebrønner" @@ -331,27 +286,25 @@ #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 #: kallithea/tests/data/templates/files/files_add.html.py:219 -#: kallithea/controllers/home.py:130 #, fuzzy msgid "Branch" msgstr "Forgrening" -#: kallithea/controllers/home.py:126 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:132 kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Etikett" -#: kallithea/controllers/home.py:138 kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Bokmerke" #: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 msgid "Public Journal" msgstr "Offentlig loggbok" @@ -362,15 +315,10 @@ #: kallithea/tests/data/templates/base/base.html.py:498 #: kallithea/tests/data/templates/journal/journal.html.py:124 #: kallithea/tests/data/templates/journal/journal.html.py:228 -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Loggbok" #: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 #, fuzzy msgid "Bad captcha" msgstr "Feilaktig CAPTCHA" @@ -380,31 +328,25 @@ msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:193 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Passordbekreftelseskode sendt" -#: kallithea/controllers/login.py:242 kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Ugyldig passordtilbakestillingssymbol" #: kallithea/controllers/login.py:247 #: kallithea/controllers/admin/my_account.py:157 -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 msgid "Successfully updated password" msgstr "Passord oppdatert" #: kallithea/controllers/pullrequests.py:73 -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 #, fuzzy, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Ugyldig analytiker \"%s\" angitt" #: kallithea/controllers/pullrequests.py:135 -#: kallithea/controllers/pullrequests.py:124 #, python-format msgid "%s (closed)" msgstr "%s (lukket)" @@ -414,44 +356,33 @@ #: kallithea/tests/data/templates/changeset/changeset.html.py:408 #: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 #: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 -#: kallithea/controllers/pullrequests.py:152 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Endringssett" #: kallithea/controllers/pullrequests.py:183 -#: kallithea/controllers/pullrequests.py:173 #, fuzzy msgid "Special" msgstr "Spesiell" #: kallithea/controllers/pullrequests.py:184 -#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Likemennsforgreninger" #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 -#: 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 "Bokmerker" #: kallithea/controllers/pullrequests.py:326 -#: kallithea/controllers/pullrequests.py:310 #, python-format msgid "Error creating pull request: %s" msgstr "Feil ved opprettelse av ny innsendelsesforespørsel: %s" #: kallithea/controllers/pullrequests.py:353 #: kallithea/controllers/pullrequests.py:376 -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 msgid "Error occurred while creating pull request" msgstr "Feil inntraff under opprettelse av innsendelsesforespørsel" #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:363 msgid "Successfully opened new pull request" msgstr "Åpnet en ny innsendelsesforespørsel" @@ -471,18 +402,14 @@ #: kallithea/controllers/pullrequests.py:430 #: kallithea/model/pull_request.py:234 -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 msgid "No description" msgstr "Ingen beskrivelse" #: kallithea/controllers/pullrequests.py:439 -#: kallithea/controllers/pullrequests.py:514 msgid "Pull request updated" msgstr "Innsendingsforespørsel oppdatert" #: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:529 msgid "Successfully deleted pull request" msgstr "Slettet innsendingsforespørsel" @@ -497,16 +424,13 @@ msgstr "" #: kallithea/controllers/pullrequests.py:532 -#: kallithea/controllers/pullrequests.py:595 #, python-format msgid "This pull request has already been merged to %s." msgstr "Denne innsendingsforespørselen har allerede blitt flettet inn i %s." #: kallithea/controllers/pullrequests.py:534 -#: kallithea/controllers/pullrequests.py:597 msgid "This pull request has been closed and can not be updated." -msgstr "" -"Denne innsendingsforespørselen har blitt lukket, og kan ikke oppdateres." +msgstr "Denne innsendingsforespørselen har blitt lukket, og kan ikke oppdateres." #: kallithea/controllers/pullrequests.py:552 #, python-format @@ -518,7 +442,6 @@ msgstr "" #: kallithea/controllers/pullrequests.py:564 -#: kallithea/controllers/pullrequests.py:627 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Merk: Forgreningen %s har et annet hode: %s." @@ -537,7 +460,6 @@ msgstr "" #: kallithea/controllers/pullrequests.py:665 -#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "Ingen tilgang til endring av innsendingsforespørselsstatus" @@ -546,31 +468,27 @@ msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/search.py:134 kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Ugyldig søkespørring. Prøv å sette den i sistattegn." -#: kallithea/controllers/search.py:139 kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Det er ingen indeks å søke i. Kjør en annen whoosh-indekserer" -#: kallithea/controllers/search.py:143 kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Feil inntraff under søkeoperasjon." #: kallithea/controllers/summary.py:173 #: kallithea/templates/summary/summary.html:360 #: kallithea/tests/data/templates/summary/summary.html.py:293 -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 msgid "No data ready yet" msgstr "Ingen data klar enda" #: kallithea/controllers/summary.py:176 #: kallithea/templates/summary/summary.html:88 #: kallithea/tests/data/templates/summary/summary.html.py:161 -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 msgid "Statistics are disabled for this repository" msgstr "Statistikk er avskrudd for denne pakkebrønnen" @@ -583,57 +501,40 @@ msgstr "feil inntraff under oppdatering av autentiseringsinnstillinger" #: kallithea/controllers/admin/defaults.py:75 -#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "Forvalgte innstillinger oppdatert" #: kallithea/controllers/admin/defaults.py:90 -#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "Feil inntraff under oppdatering av forvalg" #: kallithea/controllers/admin/gists.py:58 #: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:250 -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 msgid "Forever" msgstr "For alltid" #: kallithea/controllers/admin/gists.py:59 #: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:251 -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 msgid "5 minutes" msgstr "Fem minutter" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:252 -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 msgid "1 hour" msgstr "Én time" #: kallithea/controllers/admin/gists.py:61 #: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:253 -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 msgid "1 day" msgstr "Én dag" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:254 -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 msgid "1 month" msgstr "Én måned" @@ -642,111 +543,84 @@ #: kallithea/controllers/admin/users.py:256 #: kallithea/templates/admin/my_account/my_account_api_keys.html:65 #: kallithea/templates/admin/users/user_edit_api_keys.html:65 -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 msgid "Lifetime" msgstr "Livstid" #: kallithea/controllers/admin/gists.py:141 -#: kallithea/controllers/admin/gists.py:146 msgid "Error occurred during gist creation" msgstr "Feil inntraff under gist-opprettelse" #: kallithea/controllers/admin/gists.py:159 -#: kallithea/controllers/admin/gists.py:184 #, python-format msgid "Deleted gist %s" msgstr "Slettet gist-en %s" #: kallithea/controllers/admin/gists.py:200 -#: kallithea/controllers/admin/gists.py:233 msgid "Unmodified" msgstr "Uendret" #: kallithea/controllers/admin/gists.py:229 -#: kallithea/controllers/admin/gists.py:262 msgid "Successfully updated gist content" msgstr "Oppdaterte gist-innhold" #: kallithea/controllers/admin/gists.py:234 -#: kallithea/controllers/admin/gists.py:267 msgid "Successfully updated gist data" msgstr "Oppdaterte gist-data" #: kallithea/controllers/admin/gists.py:237 -#: kallithea/controllers/admin/gists.py:270 #, fuzzy, python-format msgid "Error occurred during update of gist %s" msgstr "Feil inntraff under oppdatering av gist-en %s" #: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 kallithea/controllers/admin/my_account.py:70 -#: kallithea/model/user.py:215 kallithea/model/user.py:237 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" -msgstr "" -"Du kan ikke endre denne brukeren siden den er avgjørende for hele programmet" +msgstr "Du kan ikke endre denne brukeren siden den er avgjørende for hele programmet" #: kallithea/controllers/admin/my_account.py:119 -#: kallithea/controllers/admin/my_account.py:129 msgid "Your account was updated successfully" msgstr "Kontoen din ble oppdatert" #: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:183 -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 #, fuzzy, python-format msgid "Error occurred during update of user %s" msgstr "Feil inntraff under oppdatering av brukeren %s" #: kallithea/controllers/admin/my_account.py:168 -#: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "Feil inntraff under oppdatering av brukerpassord" #: kallithea/controllers/admin/my_account.py:209 #: kallithea/controllers/admin/users.py:371 -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 #, fuzzy, python-format msgid "Added email %s to user" msgstr "La til e-postadressen %s for bruker" #: kallithea/controllers/admin/my_account.py:215 #: kallithea/controllers/admin/users.py:377 -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 #, fuzzy msgid "An error occurred during email saving" msgstr "Feil inntraff under lagring av e-postadresse" #: kallithea/controllers/admin/my_account.py:224 #: kallithea/controllers/admin/users.py:387 -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 #, fuzzy msgid "Removed email from user" msgstr "Fjernet e-postadresse fra bruker" #: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:273 -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 msgid "API key successfully created" msgstr "API-nøkkel opprettet" #: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:283 -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 msgid "API key successfully reset" msgstr "API-nøkkel tilbakestilt" #: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:287 -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 msgid "API key successfully deleted" msgstr "API-nøkkel slettet" @@ -758,10 +632,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 #: kallithea/tests/data/templates/base/perms_summary.html.py:63 -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 msgid "Read" msgstr "LEs" @@ -773,10 +643,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 #: kallithea/tests/data/templates/base/perms_summary.html.py:69 -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 msgid "Write" msgstr "Skriv" @@ -830,20 +696,6 @@ #: kallithea/tests/data/templates/base/base.html.py:562 #: kallithea/tests/data/templates/base/base.html.py:564 #: kallithea/tests/data/templates/base/perms_summary.html.py:75 -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html: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 msgid "Admin" msgstr "Admin" @@ -857,49 +709,22 @@ #: kallithea/templates/base/root.html:43 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 #: kallithea/tests/data/templates/base/root.html.py:121 -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 msgid "Disabled" msgstr "Avskrudd" #: kallithea/controllers/admin/permissions.py:78 -#: kallithea/controllers/admin/permissions.py:77 msgid "Allowed with manual account activation" msgstr "Tillatt med manuell kontoaktivering" #: kallithea/controllers/admin/permissions.py:80 -#: kallithea/controllers/admin/permissions.py:79 msgid "Allowed with automatic account activation" msgstr "Tillatt med automatisk kontoaktivering" #: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: 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:1702 msgid "Manual activation of external account" msgstr "Manuell aktivering av ekstern konto" #: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: 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:1703 msgid "Automatic activation of external account" msgstr "Automatisk aktivering av ekstern konto" @@ -912,70 +737,54 @@ #: kallithea/templates/base/root.html:42 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 #: kallithea/tests/data/templates/base/root.html.py:119 -#: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 -#: kallithea/controllers/admin/permissions.py:95 -#: kallithea/controllers/admin/permissions.py:98 -#: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 msgid "Enabled" msgstr "Påskrudd" #: kallithea/controllers/admin/permissions.py:125 -#: kallithea/controllers/admin/permissions.py:124 #, fuzzy msgid "Global permissions updated successfully" msgstr "Globale tilganger oppdatert" #: kallithea/controllers/admin/permissions.py:140 -#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "Feil inntraff under oppdatering av tilganger" #: kallithea/controllers/admin/repo_groups.py:180 -#: kallithea/controllers/admin/repo_groups.py:188 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Feil inntraff under opprettelse av pakkebrønnsgruppen %s" #: kallithea/controllers/admin/repo_groups.py:185 -#: kallithea/controllers/admin/repo_groups.py:193 #, python-format msgid "Created repository group %s" msgstr "Opprettet pakkebrønnsgruppen %s" #: kallithea/controllers/admin/repo_groups.py:232 -#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "Updated repository group %s" msgstr "Oppdaterte pakkebrønnsgruppen %s" #: kallithea/controllers/admin/repo_groups.py:248 -#: kallithea/controllers/admin/repo_groups.py:266 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Feil inntraff under oppdatering av pakkebrønnsgruppen %s" #: kallithea/controllers/admin/repo_groups.py:258 -#: kallithea/controllers/admin/repo_groups.py:284 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Denne gruppen inneholder %s pakkebrønner og kan ikke slettes" #: kallithea/controllers/admin/repo_groups.py:265 -#: kallithea/controllers/admin/repo_groups.py:291 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Denne grunnen inneholder %s undergrupper og kan ikke slettes" #: kallithea/controllers/admin/repo_groups.py:271 -#: kallithea/controllers/admin/repo_groups.py:297 #, python-format msgid "Removed repository group %s" msgstr "Fjernet pakkebrønnsgruppen %s" #: kallithea/controllers/admin/repo_groups.py:276 -#: kallithea/controllers/admin/repo_groups.py:302 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Feil inntraff under sletting av pakkebrønnsgruppen %s" @@ -983,95 +792,76 @@ #: kallithea/controllers/admin/repo_groups.py:361 #: kallithea/controllers/admin/repo_groups.py:391 #: kallithea/controllers/admin/user_groups.py:305 -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 #, fuzzy msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbakekalle egen administratortilgang" #: kallithea/controllers/admin/repo_groups.py:376 -#: kallithea/controllers/admin/repo_groups.py:420 msgid "Repository group permissions updated" msgstr "Pakkebrønnsgruppetilganger oppdatert" #: kallithea/controllers/admin/repo_groups.py:408 #: kallithea/controllers/admin/repos.py:362 #: kallithea/controllers/admin/user_groups.py:317 -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "En feil inntraff under tilbakekalling av tilgang" #: kallithea/controllers/admin/repos.py:138 -#: kallithea/controllers/admin/repos.py:152 #, python-format msgid "Error creating repository %s" msgstr "Feil under opprettelse av pakkebrønnen %s" #: kallithea/controllers/admin/repos.py:198 -#: kallithea/controllers/admin/repos.py:213 #, python-format msgid "Created repository %s from %s" msgstr "Opprettet pakkebrønnen %s fra %s" #: kallithea/controllers/admin/repos.py:207 -#: kallithea/controllers/admin/repos.py:222 #, python-format msgid "Forked repository %s as %s" msgstr "Forgrenet pakkebrønnen %s som %s" #: kallithea/controllers/admin/repos.py:210 -#: kallithea/controllers/admin/repos.py:225 #, python-format msgid "Created repository %s" msgstr "Opprettet pakkebrønnen %s" #: kallithea/controllers/admin/repos.py:239 -#: kallithea/controllers/admin/repos.py:262 #, python-format msgid "Repository %s updated successfully" msgstr "Pakkebrønnen %s ble oppdatert" #: kallithea/controllers/admin/repos.py:260 -#: kallithea/controllers/admin/repos.py:283 #, python-format msgid "Error occurred during update of repository %s" msgstr "Feil under oppdatering av pakkebrønnen %s" #: kallithea/controllers/admin/repos.py:278 -#: kallithea/controllers/admin/repos.py:310 #, python-format msgid "Detached %s forks" msgstr "Avhektet %s forgreninger" #: kallithea/controllers/admin/repos.py:281 -#: kallithea/controllers/admin/repos.py:313 #, python-format msgid "Deleted %s forks" msgstr "Slettet %s forgreninger" #: kallithea/controllers/admin/repos.py:286 -#: kallithea/controllers/admin/repos.py:318 #, python-format msgid "Deleted repository %s" msgstr "Slettet pakkebrønnen %s" #: kallithea/controllers/admin/repos.py:289 -#: kallithea/controllers/admin/repos.py:321 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Kan ikke slette pakkebrønne %s, som fremdeles har forgreninger" #: kallithea/controllers/admin/repos.py:294 -#: kallithea/controllers/admin/repos.py:326 #, python-format msgid "An error occurred during deletion of %s" msgstr "En feil inntraff under sletting av %s" #: kallithea/controllers/admin/repos.py:338 -#: kallithea/controllers/admin/repos.py:374 msgid "Repository permissions updated" msgstr "Pakkebrønnstilganger oppdatert" @@ -1086,448 +876,386 @@ msgstr "" #: kallithea/controllers/admin/repos.py:405 -#: kallithea/controllers/admin/repos.py:444 msgid "An error occurred during removal of field" msgstr "Feil inntraff under fjerning av felt" #: kallithea/controllers/admin/repos.py:419 -#: kallithea/controllers/admin/repos.py:460 msgid "-- Not a fork --" msgstr "-- Ikke en forgrening --" #: kallithea/controllers/admin/repos.py:450 -#: kallithea/controllers/admin/repos.py:491 msgid "Updated repository visibility in public journal" msgstr "Oppdaterte pakkebrønnssynlighet i offentlig loggbok" #: kallithea/controllers/admin/repos.py:454 -#: kallithea/controllers/admin/repos.py:495 #, fuzzy msgid "An error occurred during setting this repository in public journal" -msgstr "" -"En feil inntraff under innlemmelse av denne pakkebrønnen i offentlig loggbok" +msgstr "En feil inntraff under innlemmelse av denne pakkebrønnen i offentlig loggbok" #: kallithea/controllers/admin/repos.py:471 -#: kallithea/controllers/admin/repos.py:512 msgid "Nothing" msgstr "Ingenting" #: kallithea/controllers/admin/repos.py:473 -#: kallithea/controllers/admin/repos.py:514 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markerte pakkebrønnen %s som en forgrening av %s" #: kallithea/controllers/admin/repos.py:480 -#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during this operation" msgstr "En feil inntraff under denne operasjonen" #: kallithea/controllers/admin/repos.py:496 #: kallithea/controllers/admin/repos.py:517 -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 msgid "Repository has been locked" msgstr "Pakkebrønnen har blitt låst" #: kallithea/controllers/admin/repos.py:499 #: kallithea/controllers/admin/repos.py:514 -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 msgid "Repository has been unlocked" msgstr "Pakkebrønnen har blitt låst opp" #: kallithea/controllers/admin/repos.py:502 #: kallithea/controllers/admin/repos.py:521 -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 msgid "An error occurred during unlocking" msgstr "En feil inntraff under opplåsning" #: kallithea/controllers/admin/repos.py:533 -#: kallithea/controllers/admin/repos.py:582 msgid "Cache invalidation successful" msgstr "" #: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:586 msgid "An error occurred during cache invalidation" msgstr "" #: kallithea/controllers/admin/repos.py:550 -#: kallithea/controllers/admin/repos.py:601 msgid "Pulled from remote location" msgstr "" #: kallithea/controllers/admin/repos.py:553 -#: kallithea/controllers/admin/repos.py:604 msgid "An error occurred during pull from remote location" msgstr "" #: kallithea/controllers/admin/repos.py:584 -#: kallithea/controllers/admin/repos.py:637 msgid "An error occurred during deletion of repository stats" msgstr "" #: kallithea/controllers/admin/settings.py:135 -#: kallithea/controllers/admin/settings.py:170 msgid "Updated VCS settings" msgstr "" #: kallithea/controllers/admin/settings.py:139 #: kallithea/model/validators.py:426 -#: kallithea/controllers/admin/settings.py:174 -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" +msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" msgstr "" #: kallithea/controllers/admin/settings.py:145 #: kallithea/controllers/admin/settings.py:234 -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 msgid "Error occurred while updating application settings" msgstr "" #: kallithea/controllers/admin/settings.py:174 -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" #: kallithea/controllers/admin/settings.py:189 -#: kallithea/controllers/admin/settings.py:226 #, python-format msgid "Invalidated %s repositories" msgstr "" #: kallithea/controllers/admin/settings.py:230 -#: kallithea/controllers/admin/settings.py:280 msgid "Updated application settings" msgstr "" #: kallithea/controllers/admin/settings.py:283 -#: kallithea/controllers/admin/settings.py:337 msgid "Updated visualisation settings" msgstr "" #: kallithea/controllers/admin/settings.py:288 -#: kallithea/controllers/admin/settings.py:342 msgid "Error occurred during updating visualisation settings" msgstr "" #: kallithea/controllers/admin/settings.py:312 -#: kallithea/controllers/admin/settings.py:368 msgid "Please enter email address" msgstr "" #: kallithea/controllers/admin/settings.py:327 -#: kallithea/controllers/admin/settings.py:383 msgid "Send email task created" msgstr "" #: kallithea/controllers/admin/settings.py:356 -#: kallithea/controllers/admin/settings.py:414 msgid "Added new hook" msgstr "" #: kallithea/controllers/admin/settings.py:370 -#: kallithea/controllers/admin/settings.py:428 msgid "Updated hooks" msgstr "" #: kallithea/controllers/admin/settings.py:374 -#: kallithea/controllers/admin/settings.py:432 msgid "Error occurred during hook creation" msgstr "" #: kallithea/controllers/admin/settings.py:398 -#: kallithea/controllers/admin/settings.py:458 msgid "Whoosh reindex task scheduled" msgstr "" #: kallithea/controllers/admin/user_groups.py:145 -#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "" #: kallithea/controllers/admin/user_groups.py:158 -#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" #: kallithea/controllers/admin/user_groups.py:186 -#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "" #: kallithea/controllers/admin/user_groups.py:208 -#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" #: kallithea/controllers/admin/user_groups.py:219 -#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "" #: kallithea/controllers/admin/user_groups.py:224 -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" #: kallithea/controllers/admin/user_groups.py:284 -#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:290 -#: kallithea/controllers/admin/user_groups.py:320 msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:401 #: kallithea/controllers/admin/users.py:342 -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:405 #: kallithea/controllers/admin/users.py:346 -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 msgid "An error occurred during permissions saving" msgstr "" #: kallithea/controllers/admin/users.py:125 -#: kallithea/controllers/admin/users.py:134 #, python-format msgid "Created user %s" msgstr "" #: kallithea/controllers/admin/users.py:140 -#: kallithea/controllers/admin/users.py:149 #, python-format msgid "Error occurred during creation of user %s" msgstr "" #: kallithea/controllers/admin/users.py:164 -#: kallithea/controllers/admin/users.py:182 msgid "User updated successfully" msgstr "" #: kallithea/controllers/admin/users.py:192 -#: kallithea/controllers/admin/users.py:218 msgid "Successfully deleted user" msgstr "" #: kallithea/controllers/admin/users.py:197 -#: kallithea/controllers/admin/users.py:223 msgid "An error occurred during deletion of user" msgstr "" #: kallithea/controllers/admin/users.py:205 -#: kallithea/controllers/admin/users.py:236 msgid "The default user cannot be edited" msgstr "" #: kallithea/controllers/admin/users.py:414 -#: kallithea/controllers/admin/users.py:463 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" #: kallithea/controllers/admin/users.py:420 -#: kallithea/controllers/admin/users.py:469 msgid "An error occurred while adding IP address" msgstr "" #: kallithea/controllers/admin/users.py:432 -#: kallithea/controllers/admin/users.py:483 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:777 kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:829 kallithea/lib/auth.py:832 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:857 kallithea/lib/auth.py:864 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:449 kallithea/lib/auth.py:757 +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/base.py:508 kallithea/lib/auth.py:785 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/base.py:591 kallithea/lib/base.py:490 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:617 kallithea/lib/base.py:516 +#: kallithea/lib/base.py:617 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:68 kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:89 kallithea/lib/diffs.py:82 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:99 kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:89 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:600 kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:602 kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:613 kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:613 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:662 kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:668 kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:687 kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:688 kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" #: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 #: kallithea/tests/data/templates/changelog/changelog.html.py:132 -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:713 kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:734 kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:744 kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" #: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:748 kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" #: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "" #: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:756 kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:766 kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:768 kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:770 kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:772 kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:774 kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:776 kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:778 kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:780 kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:782 kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:784 kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:786 kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:788 kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:913 kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" @@ -1537,257 +1265,222 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:310 #: kallithea/tests/data/templates/compare/compare_diff.html.py:165 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 -#: 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:942 kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:945 kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:948 kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:951 kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:956 kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1230 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 "" - -#: kallithea/lib/utils2.py:387 kallithea/lib/utils2.py:415 +#: kallithea/lib/helpers.py:1230 +#, 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 "" + +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:388 kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:389 kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:390 kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:391 kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:392 kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:408 kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:410 kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:412 kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:415 kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:418 kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/model/comment.py:68 kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" #: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1574 kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: 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:1515 +#: kallithea/model/db.py:1574 msgid "top level" msgstr "" -#: kallithea/model/db.py:1715 kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: 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:1666 +#: kallithea/model/db.py:1715 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1717 kallithea/model/db.py:1668 +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1718 kallithea/model/db.py:1669 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1719 kallithea/model/db.py:1670 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1720 kallithea/model/db.py:1671 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1722 kallithea/model/db.py:1673 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1723 kallithea/model/db.py:1674 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1724 kallithea/model/db.py:1675 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1725 kallithea/model/db.py:1676 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1727 kallithea/model/db.py:1678 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1728 kallithea/model/db.py:1679 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1729 kallithea/model/db.py:1680 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1730 kallithea/model/db.py:1681 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1732 kallithea/model/db.py:1683 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1733 kallithea/model/db.py:1684 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1735 kallithea/model/db.py:1686 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1736 kallithea/model/db.py:1687 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1738 kallithea/model/db.py:1689 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1739 kallithea/model/db.py:1690 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1741 kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 +#: kallithea/model/db.py:1741 msgid "Repository creation enabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1742 kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: 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 "" - -#: kallithea/model/db.py:1744 kallithea/model/db.py:1695 +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1745 kallithea/model/db.py:1696 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1747 kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: 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:1698 +#: kallithea/model/db.py:1747 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1748 kallithea/model/db.py:1699 +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1749 kallithea/model/db.py:1700 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2276 kallithea/model/db.py:2238 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2277 kallithea/model/db.py:2241 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "" @@ -1795,134 +1488,117 @@ msgid "Not approved" msgstr "" -#: kallithea/model/db.py:2279 kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: 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:2239 +#: kallithea/model/db.py:2279 msgid "Approved" msgstr "" -#: kallithea/model/forms.py:58 kallithea/model/forms.py:57 +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "" -#: kallithea/model/forms.py:59 kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:67 kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "" -#: kallithea/model/forms.py:68 kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:167 kallithea/model/forms.py:160 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:240 kallithea/model/notification.py:255 +#: kallithea/model/notification.py:240 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "" -#: kallithea/model/notification.py:241 kallithea/model/notification.py:256 +#: kallithea/model/notification.py:241 #, python-format msgid "%(user)s sent message %(age)s" msgstr "" -#: kallithea/model/notification.py:242 kallithea/model/notification.py:257 +#: kallithea/model/notification.py:242 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "" -#: kallithea/model/notification.py:243 kallithea/model/notification.py:258 +#: kallithea/model/notification.py:243 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "" -#: kallithea/model/notification.py:244 kallithea/model/notification.py:259 +#: kallithea/model/notification.py:244 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:245 kallithea/model/notification.py:260 +#: kallithea/model/notification.py:245 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "" -#: kallithea/model/notification.py:252 kallithea/model/notification.py:267 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: kallithea/model/notification.py:253 kallithea/model/notification.py:268 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:254 kallithea/model/notification.py:269 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:255 kallithea/model/notification.py:270 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:256 kallithea/model/notification.py:271 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:257 kallithea/model/notification.py:272 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:288 #, python-format -msgid "" -"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " -"%(branch)s" -msgstr "" - -#: kallithea/model/notification.py:291 kallithea/model/notification.py:306 +msgid "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on %(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" #: kallithea/model/notification.py:293 #, python-format -msgid "" -"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " -"%(pr_source_branch)s by %(pr_owner_username)s" +msgid "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" msgstr "" #: kallithea/model/notification.py:294 #, python-format -msgid "" -"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " -"%(pr_source_branch)s by %(pr_owner_username)s" -msgstr "" - -#: kallithea/model/notification.py:307 kallithea/model/notification.py:322 +msgid "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:307 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:76 kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" @@ -1933,9 +1609,7 @@ #: kallithea/model/pull_request.py:219 #, python-format -msgid "" -"Cannot create pull request - criss cross merge detected, please merge a " -"later %s revision to %s" +msgid "Cannot create pull request - criss cross merge detected, please merge a later %s revision to %s" msgstr "" #: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 @@ -1957,8 +1631,7 @@ #: kallithea/model/pull_request.py:362 #, python-format -msgid "" -"This iteration is based on another %s revision and there is no simple diff." +msgid "This iteration is based on another %s revision and there is no simple diff." msgstr "" #: kallithea/model/pull_request.py:364 @@ -1971,226 +1644,208 @@ msgid "Closed, next iteration: %s ." msgstr "" -#: kallithea/model/scm.py:697 kallithea/model/scm.py:812 +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:189 kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:253 kallithea/model/user.py:256 -msgid "" -"You can't remove this user since it is crucial for the entire application" -msgstr "" - -#: kallithea/model/user.py:258 kallithea/model/user.py:261 -#, python-format -msgid "" -"User \"%s\" still owns %s repositories and cannot be removed. Switch owners " -"or remove those repositories: %s" -msgstr "" - -#: kallithea/model/user.py:263 kallithea/model/user.py:266 -#, python-format -msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch " -"owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:270 kallithea/model/user.py:273 -#, python-format -msgid "" -"User \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups: %s" -msgstr "" - -#: kallithea/model/user.py:364 kallithea/model/user.py:360 +#: kallithea/model/user.py:253 +msgid "You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 +#, python-format +msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:263 +#, python-format +msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 +#, python-format +msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:413 kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:414 kallithea/model/user.py:409 -#, python-format -msgid "" -"The password to your account %s has been changed using password reset form." +#: kallithea/model/user.py:414 +#, python-format +msgid "The password to your account %s has been changed using password reset form." msgstr "" #: kallithea/model/validators.py:54 kallithea/model/validators.py:55 -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:73 kallithea/model/validators.py:95 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:75 kallithea/model/validators.py:97 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:99 -msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:104 kallithea/model/validators.py:126 +#: kallithea/model/validators.py:77 +msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:111 kallithea/model/validators.py:133 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:131 kallithea/model/validators.py:152 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:132 kallithea/model/validators.py:153 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:134 kallithea/model/validators.py:155 -msgid "" -"user group name may only contain alphanumeric characters underscores, " -"periods or dashes and must begin with alphanumeric character" -msgstr "" - -#: kallithea/model/validators.py:174 kallithea/model/validators.py:193 +#: kallithea/model/validators.py:134 +msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:175 kallithea/model/validators.py:194 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:177 kallithea/model/validators.py:196 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:233 kallithea/model/validators.py:254 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:248 kallithea/model/validators.py:269 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:264 kallithea/model/validators.py:285 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:279 kallithea/model/validators.py:300 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:310 kallithea/model/validators.py:331 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:326 kallithea/model/validators.py:345 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:328 kallithea/model/validators.py:347 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:329 kallithea/model/validators.py:348 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:331 kallithea/model/validators.py:350 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:449 kallithea/model/validators.py:465 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:450 kallithea/model/validators.py:466 -msgid "" -"Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn" -"+https URL" -msgstr "" - -#: kallithea/model/validators.py:475 kallithea/model/validators.py:489 +#: kallithea/model/validators.py:450 +msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:490 kallithea/model/validators.py:504 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:492 kallithea/model/validators.py:506 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:542 kallithea/model/validators.py:556 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:582 kallithea/model/validators.py:597 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:675 kallithea/model/validators.py:690 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:692 kallithea/model/validators.py:705 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:712 kallithea/model/validators.py:725 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:749 kallithea/model/validators.py:762 -msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" -msgstr "" - -#: kallithea/model/validators.py:761 kallithea/model/validators.py:774 +#: kallithea/model/validators.py:749 +msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:762 kallithea/model/validators.py:775 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:795 kallithea/model/validators.py:808 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:809 kallithea/model/validators.py:822 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:825 kallithea/model/validators.py:838 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" #: kallithea/templates/about.html:4 kallithea/templates/about.html:16 -#: kallithea/templates/about.html:17 msgid "About" msgstr "" @@ -2204,8 +1859,6 @@ #: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 #: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 #: kallithea/tests/data/templates/admin/repos/repos.html.py:107 -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "" @@ -2219,20 +1872,16 @@ #: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 #: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 #: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "" #: kallithea/templates/index_base.html:37 #: kallithea/tests/data/templates/index_base.html.py:90 -#: kallithea/templates/index_base.html:32 msgid "You have admin right to this group, and can edit it" msgstr "" #: kallithea/templates/index_base.html:37 #: kallithea/tests/data/templates/index_base.html.py:92 -#: kallithea/templates/index_base.html:32 msgid "Edit Repository Group" msgstr "" @@ -2278,25 +1927,6 @@ #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 #: kallithea/tests/data/templates/summary/summary.html.py:147 -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 msgid "Description" msgstr "" @@ -2305,13 +1935,11 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #: kallithea/tests/data/templates/admin/admin_log.html.py:43 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 msgid "Repository" msgstr "" #: kallithea/templates/index_base.html:92 #: kallithea/tests/data/templates/index_base.html.py:132 -#: kallithea/templates/index_base.html:128 msgid "Last Change" msgstr "" @@ -2323,12 +1951,6 @@ #: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 #: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 #: kallithea/tests/data/templates/admin/repos/repos.html.py:116 -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "" @@ -2350,14 +1972,6 @@ #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 #: kallithea/tests/data/templates/summary/summary.html.py:199 -#: kallithea/templates/index_base.html:132 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 -#: kallithea/templates/admin/user_groups/user_groups.html:50 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "" @@ -2366,13 +1980,11 @@ #: kallithea/tests/data/templates/login.html.py:64 #: kallithea/tests/data/templates/login.html.py:106 #: kallithea/tests/data/templates/base/base.html.py:626 -#: kallithea/templates/login.html:15 kallithea/templates/base/base.html:326 msgid "Log In" msgstr "" #: kallithea/templates/login.html:12 #: kallithea/tests/data/templates/login.html.py:60 -#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "" @@ -2395,13 +2007,6 @@ #: kallithea/tests/data/templates/admin/users/users.html.py:109 #: kallithea/tests/data/templates/base/base.html.py:611 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: 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:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "" @@ -2414,10 +2019,6 @@ #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 #: kallithea/tests/data/templates/admin/users/user_add.html.py:113 #: kallithea/tests/data/templates/base/base.html.py:615 -#: 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:311 msgid "Password" msgstr "" @@ -2427,20 +2028,17 @@ #: kallithea/templates/login.html:46 #: kallithea/tests/data/templates/login.html.py:79 -#: kallithea/templates/login.html:53 msgid "Forgot your password ?" msgstr "" #: kallithea/templates/login.html:49 #: kallithea/tests/data/templates/login.html.py:83 #: kallithea/tests/data/templates/base/base.html.py:623 -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 msgid "Don't have an account ?" msgstr "" #: kallithea/templates/login.html:52 #: kallithea/tests/data/templates/login.html.py:86 -#: kallithea/templates/login.html:59 msgid "Sign In" msgstr "" @@ -2453,7 +2051,6 @@ #: kallithea/templates/password_reset_confirmation.html:13 #: kallithea/tests/data/templates/password_reset.html.py:60 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 -#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "" @@ -2464,13 +2061,11 @@ #: kallithea/tests/data/templates/password_reset.html.py:64 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 -#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "" #: kallithea/templates/password_reset.html:21 #: kallithea/tests/data/templates/password_reset.html.py:69 -#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "" @@ -2478,61 +2073,47 @@ #: kallithea/templates/register.html:65 #: kallithea/tests/data/templates/password_reset.html.py:75 #: kallithea/tests/data/templates/register.html.py:95 -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "" #: kallithea/templates/password_reset.html:39 #: kallithea/tests/data/templates/password_reset.html.py:80 -#: kallithea/templates/password_reset.html:46 msgid "Send Password Reset Email" msgstr "" #: kallithea/templates/password_reset.html:44 #: kallithea/tests/data/templates/password_reset.html.py:82 -#: kallithea/templates/password_reset.html:47 -msgid "" -"A password reset link will be sent to the specified email address if it is " -"registered in the system." +msgid "A password reset link will be sent to the specified email address if it is registered in the system." msgstr "" #: kallithea/templates/password_reset_confirmation.html:20 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 -#: 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:21 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 -#: 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." +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:26 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 -#: kallithea/templates/password_reset_confirmation.html:30 msgid "Code you received in the email" msgstr "" #: kallithea/templates/password_reset_confirmation.html:33 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 -#: kallithea/templates/password_reset_confirmation.html:39 msgid "New Password" msgstr "" #: kallithea/templates/password_reset_confirmation.html:40 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 -#: kallithea/templates/password_reset_confirmation.html:48 msgid "Confirm New Password" msgstr "" #: kallithea/templates/password_reset_confirmation.html:49 #: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 -#: kallithea/templates/password_reset_confirmation.html:56 msgid "Confirm" msgstr "" @@ -2541,20 +2122,17 @@ #: kallithea/tests/data/templates/register.html.py:64 #: kallithea/tests/data/templates/register.html.py:100 #: kallithea/tests/data/templates/register.html.py:137 -#: kallithea/templates/register.html:14 kallithea/templates/register.html:90 msgid "Sign Up" msgstr "" #: kallithea/templates/register.html:13 #: kallithea/tests/data/templates/register.html.py:60 -#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "" #: kallithea/templates/register.html:36 #: kallithea/tests/data/templates/register.html.py:77 -#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "" @@ -2568,11 +2146,6 @@ #: kallithea/tests/data/templates/admin/users/user_add.html.py:121 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 #: kallithea/tests/data/templates/admin/users/users.html.py:111 -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "" @@ -2586,11 +2159,6 @@ #: kallithea/tests/data/templates/admin/users/user_add.html.py:125 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 #: kallithea/tests/data/templates/admin/users/users.html.py:113 -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "" @@ -2605,22 +2173,16 @@ #: kallithea/tests/data/templates/admin/settings/settings.html.py:132 #: kallithea/tests/data/templates/admin/users/user_add.html.py:129 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 msgid "Email" msgstr "" #: kallithea/templates/register.html:77 #: kallithea/tests/data/templates/register.html.py:104 -#: kallithea/templates/register.html:92 msgid "Registered accounts are ready to use and need no further action." msgstr "" #: kallithea/templates/register.html:79 #: kallithea/tests/data/templates/register.html.py:108 -#: kallithea/templates/register.html:94 msgid "Please wait for an administrator to activate your account." msgstr "" @@ -2630,7 +2192,6 @@ #: kallithea/tests/data/templates/admin/admin.html.py:133 #: kallithea/tests/data/templates/admin/admin.html.py:155 #: kallithea/tests/data/templates/base/base.html.py:239 -#: kallithea/templates/base/base.html:59 msgid "Admin Journal" msgstr "" @@ -2644,7 +2205,6 @@ #: kallithea/templates/journal/journal.html:12 #: kallithea/tests/data/templates/admin/admin.html.py:131 #: kallithea/tests/data/templates/journal/journal.html.py:122 -#: kallithea/templates/journal/journal.html:11 msgid "Filter" msgstr "" @@ -2652,7 +2212,6 @@ #: kallithea/templates/journal/journal.html:13 #: kallithea/tests/data/templates/admin/admin.html.py:135 #: kallithea/tests/data/templates/journal/journal.html.py:126 -#: kallithea/templates/journal/journal.html:12 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2672,26 +2231,11 @@ #: kallithea/tests/data/templates/admin/repos/repos.html.py:122 #: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 #: kallithea/tests/data/templates/admin/users/users.html.py:123 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "" #: kallithea/templates/admin/admin_log.html:8 #: kallithea/tests/data/templates/admin/admin_log.html.py:45 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2702,7 +2246,6 @@ #: kallithea/templates/admin/admin_log.html:61 #: kallithea/tests/data/templates/admin/admin_log.html.py:84 -#: kallithea/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "" @@ -2715,39 +2258,31 @@ #: kallithea/templates/base/base.html:61 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 #: kallithea/tests/data/templates/base/base.html.py:263 -#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:27 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 -#: kallithea/templates/admin/auth/auth_settings.html:28 msgid "Authentication Plugins" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:29 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 -#: kallithea/templates/admin/auth/auth_settings.html:31 msgid "Enabled Plugins" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:32 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 -#: kallithea/templates/admin/auth/auth_settings.html:33 -msgid "" -"Comma-separated list of plugins; Kallithea will try user authentication in " -"plugin order" +msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:36 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 -#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Available built-in plugins" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:53 #: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 -#: kallithea/templates/admin/auth/auth_settings.html:51 msgid "Plugin" msgstr "" @@ -2777,22 +2312,6 @@ #: kallithea/tests/data/templates/admin/users/user_add.html.py:141 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 #: kallithea/tests/data/templates/base/default_perms_box.html.py:72 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "" @@ -2802,7 +2321,6 @@ #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 #: kallithea/tests/data/templates/base/base.html.py:267 -#: kallithea/templates/base/base.html:66 msgid "Repository Defaults" msgstr "" @@ -2811,9 +2329,6 @@ #: kallithea/templates/admin/repos/repo_edit_fields.html:8 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "" @@ -2824,10 +2339,6 @@ #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 msgid "Private repository" msgstr "" @@ -2837,44 +2348,30 @@ #: kallithea/templates/forks/fork.html:61 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +msgid "Private repositories are only visible to people explicitly added as collaborators." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 #: kallithea/templates/admin/repos/repo_edit_settings.html:67 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 #: kallithea/templates/admin/repos/repo_edit_settings.html:70 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 #: kallithea/templates/admin/repos/repo_edit_settings.html:74 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 #: kallithea/templates/admin/repos/repo_edit_settings.html:77 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 msgid "Enable download menu on summary page." msgstr "" @@ -2882,17 +2379,12 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 #: kallithea/templates/admin/repos/repo_edit_settings.html:81 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 msgid "Enable locking" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 #: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2902,26 +2394,19 @@ msgstr "" #: kallithea/templates/admin/gists/edit.html:35 -#: kallithea/templates/admin/gists/edit.html:36 -#, python-format -msgid "" -"Gist was update since you started editing. Copy your changes and click " -"%(here)s to reload new version." +#, python-format +msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version." msgstr "" #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 #: kallithea/tests/data/templates/admin/gists/new.html.py:203 -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "" #: kallithea/templates/admin/gists/edit.html:54 #: kallithea/templates/admin/gists/new.html:38 #: kallithea/tests/data/templates/admin/gists/new.html.py:205 -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 msgid "Gist lifetime" msgstr "" @@ -2947,16 +2432,6 @@ #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 msgid "Expires" msgstr "" @@ -2973,13 +2448,6 @@ #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html: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 msgid "Never" msgstr "" @@ -2990,7 +2458,6 @@ #: kallithea/templates/admin/gists/edit.html:146 #: kallithea/templates/changeset/changeset_file_comment.html:103 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 -#: kallithea/templates/changeset/changeset_file_comment.html:81 msgid "Cancel" msgstr "" @@ -3023,7 +2490,6 @@ #: kallithea/tests/data/templates/admin/gists/index.html.py:115 #: kallithea/tests/data/templates/admin/gists/show.html.py:115 #: kallithea/tests/data/templates/base/base.html.py:521 -#: kallithea/templates/base/base.html:237 msgid "Create New Gist" msgstr "" @@ -3031,14 +2497,11 @@ #: kallithea/templates/data_table/_dt_elements.html:88 #: kallithea/tests/data/templates/admin/gists/index.html.py:131 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 msgid "Created" msgstr "" #: kallithea/templates/admin/gists/index.html:66 #: kallithea/tests/data/templates/admin/gists/index.html.py:155 -#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "" @@ -3055,13 +2518,11 @@ #: kallithea/templates/admin/gists/new.html:53 #: kallithea/tests/data/templates/admin/gists/new.html.py:211 -#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "" #: kallithea/templates/admin/gists/new.html:54 #: kallithea/tests/data/templates/admin/gists/new.html.py:213 -#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "" @@ -3109,33 +2570,6 @@ #: kallithea/tests/data/templates/base/default_perms_box.html.py:74 #: kallithea/tests/data/templates/files/files_add.html.py:249 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "" @@ -3154,21 +2588,16 @@ #: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 #: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 #: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" #: kallithea/templates/admin/gists/show.html:35 #: kallithea/tests/data/templates/admin/gists/show.html.py:120 -#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:37 #: kallithea/tests/data/templates/admin/gists/show.html.py:124 -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" @@ -3207,28 +2636,11 @@ #: kallithea/tests/data/templates/files/files_source.html.py:82 #: kallithea/tests/data/templates/files/files_source.html.py:88 #: kallithea/tests/data/templates/files/files_source.html.py:94 -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 msgid "Delete" msgstr "" #: kallithea/templates/admin/gists/show.html:54 #: kallithea/tests/data/templates/admin/gists/show.html.py:146 -#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "" @@ -3263,22 +2675,6 @@ #: kallithea/tests/data/templates/files/files_source.html.py:86 #: kallithea/tests/data/templates/files/files_source.html.py:92 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 msgid "Edit" msgstr "" @@ -3287,22 +2683,16 @@ #: kallithea/templates/files/files_source.html:30 #: kallithea/tests/data/templates/admin/gists/show.html.py:156 #: kallithea/tests/data/templates/files/files_source.html.py:73 -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "" #: kallithea/templates/admin/gists/show.html:69 #: kallithea/tests/data/templates/admin/gists/show.html.py:164 -#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "" #: kallithea/templates/admin/gists/show.html:82 #: kallithea/tests/data/templates/admin/gists/show.html.py:178 -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" @@ -3312,7 +2702,6 @@ #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 #: kallithea/tests/data/templates/base/base.html.py:644 -#: kallithea/templates/base/base.html:343 msgid "My Account" msgstr "" @@ -3320,13 +2709,11 @@ #: kallithea/templates/admin/users/user_edit.html:29 #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 #: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 -#: kallithea/templates/admin/my_account/my_account.html:35 msgid "Profile" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:26 #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 -#: kallithea/templates/admin/my_account/my_account.html:36 msgid "Email Addresses" msgstr "" @@ -3334,13 +2721,11 @@ #: kallithea/templates/admin/users/user_edit.html:31 #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 #: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 -#: kallithea/templates/admin/my_account/my_account.html:38 msgid "API Keys" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:29 #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 -#: kallithea/templates/admin/my_account/my_account.html:39 msgid "Owned Repositories" msgstr "" @@ -3348,8 +2733,6 @@ #: kallithea/templates/journal/journal.html:33 #: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 #: kallithea/tests/data/templates/journal/journal.html.py:196 -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 msgid "Watched Repositories" msgstr "" @@ -3361,7 +2744,6 @@ #: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 #: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 #: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 -#: kallithea/templates/admin/my_account/my_account.html:41 msgid "Show Permissions" msgstr "" @@ -3369,8 +2751,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:5 #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 msgid "Built-in" msgstr "" @@ -3378,8 +2758,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:13 #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" @@ -3388,8 +2766,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:29 #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 msgid "Expired" msgstr "" @@ -3397,8 +2773,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:39 #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" @@ -3407,8 +2781,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:41 #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 msgid "Remove" msgstr "" @@ -3416,8 +2788,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:48 #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 msgid "No additional API keys specified" msgstr "" @@ -3425,8 +2795,6 @@ #: kallithea/templates/admin/users/user_edit_api_keys.html:56 #: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 msgid "New API key" msgstr "" @@ -3444,14 +2812,6 @@ #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 #: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 #: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 msgid "Add" msgstr "" @@ -3475,16 +2835,12 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:9 #: kallithea/templates/admin/users/user_edit_emails.html:9 #: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 msgid "Primary" msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:24 #: kallithea/templates/admin/users/user_edit_emails.html:24 #: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 #, python-format msgid "Confirm to delete this email: %s" msgstr "" @@ -3492,16 +2848,12 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:30 #: kallithea/templates/admin/users/user_edit_emails.html:30 #: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 msgid "No additional emails specified." msgstr "" #: kallithea/templates/admin/my_account/my_account_emails.html:39 #: kallithea/templates/admin/users/user_edit_emails.html:39 #: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 msgid "New email address" msgstr "" @@ -3510,25 +2862,20 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:8 -#: kallithea/templates/admin/my_account/my_account_password.html:10 msgid "Current password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:15 #: kallithea/templates/admin/users/user_edit_profile.html:46 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 msgid "New password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:22 -#: kallithea/templates/admin/my_account/my_account_password.html:28 msgid "Confirm new password" msgstr "" #: kallithea/templates/admin/my_account/my_account_password.html:39 -#: 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 "" @@ -3536,8 +2883,6 @@ #: kallithea/templates/admin/my_account/my_account_perms.html:3 #: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "Current IP" msgstr "" @@ -3556,8 +2901,6 @@ #: kallithea/templates/admin/users/user_edit_profile.html:12 #: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 msgid "Avatars are disabled" msgstr "" @@ -3584,24 +2927,6 @@ #: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 #: kallithea/tests/data/templates/base/perms_summary.html.py:111 #: kallithea/tests/data/templates/files/files_browser.html.py:76 -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 msgid "Name" msgstr "" @@ -3631,13 +2956,11 @@ #: kallithea/templates/base/base.html:175 #: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 #: kallithea/tests/data/templates/base/base.html.py:432 -#: kallithea/templates/base/base.html:183 msgid "Pull Requests" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:29 #: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 -#: kallithea/templates/admin/notifications/notifications.html:30 msgid "Mark All Read" msgstr "" @@ -3647,7 +2970,6 @@ #: kallithea/templates/admin/notifications/notifications_data.html:21 #: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 -#: kallithea/templates/admin/notifications/notifications_data.html:40 msgid "No notifications here yet" msgstr "" @@ -3662,7 +2984,6 @@ #: kallithea/templates/base/base.html:403 #: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 #: kallithea/tests/data/templates/base/base.html.py:640 -#: kallithea/templates/base/base.html:342 msgid "Notifications" msgstr "" @@ -3672,7 +2993,6 @@ #: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 #: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 #: kallithea/tests/data/templates/base/base.html.py:259 -#: kallithea/templates/base/base.html:64 msgid "Default Permissions" msgstr "" @@ -3692,37 +3012,27 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:4 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 -#: kallithea/templates/admin/permissions/permissions_globals.html:7 msgid "Anonymous access" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:9 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 -#: kallithea/templates/admin/permissions/permissions_globals.html:13 -#, python-format -msgid "" -"Allow access to Kallithea without needing to log in. Anonymous users use %s " -"user permissions." +#, python-format +msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:18 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 -#: kallithea/templates/admin/permissions/permissions_globals.html:25 -msgid "" -"All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:19 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 -#: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "Apply to all existing repositories" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:23 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 -#: kallithea/templates/admin/permissions/permissions_globals.html:27 msgid "Permissions for the Default user on new repositories." msgstr "" @@ -3734,32 +3044,21 @@ #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:31 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 -#: kallithea/templates/admin/permissions/permissions_globals.html:39 -msgid "" -"All default permissions on each repository group will be reset to chosen " -"permission, note that all custom default permission on repository groups " -"will be lost" +msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 -#: kallithea/templates/admin/permissions/permissions_globals.html:40 msgid "Apply to all existing repository groups" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:36 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 -#: kallithea/templates/admin/permissions/permissions_globals.html:41 msgid "Permissions for the Default user on new repository groups." msgstr "" @@ -3767,101 +3066,76 @@ #: kallithea/templates/data_table/_dt_elements.html:154 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 msgid "User group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:44 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 -#: kallithea/templates/admin/permissions/permissions_globals.html:53 -msgid "" -"All default permissions on each user group will be reset to chosen " -"permission, note that all custom default permission on user groups will be " -"lost" +msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:45 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 -#: kallithea/templates/admin/permissions/permissions_globals.html:54 msgid "Apply to all existing user groups" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:49 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 -#: kallithea/templates/admin/permissions/permissions_globals.html:55 msgid "Permissions for the Default user on new user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:52 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 -#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Top level repository creation" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:55 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "" -"Enable this to allow non-admins to create repositories at the top level." +msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:56 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 -#: 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." +msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 -#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Repository creation with group write access" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:63 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 -#: kallithea/templates/admin/permissions/permissions_globals.html:74 -msgid "" -"With this, write permission to a repository group allows creating " -"repositories inside that group. Without this, group write permissions mean " -"nothing." +msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:67 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 -#: kallithea/templates/admin/permissions/permissions_globals.html:79 msgid "User group creation" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:70 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 -#: kallithea/templates/admin/permissions/permissions_globals.html:83 msgid "Enable this to allow non-admins to create user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:74 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 -#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "Repository forking" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:77 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 -#: kallithea/templates/admin/permissions/permissions_globals.html:92 msgid "Enable this to allow non-admins to fork repositories." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:81 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 -#: kallithea/templates/admin/permissions/permissions_globals.html:97 msgid "Registration" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" @@ -3869,8 +3143,6 @@ #: kallithea/templates/admin/users/user_edit_ips.html:22 #: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 #: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" @@ -3879,8 +3151,6 @@ #: kallithea/templates/admin/users/user_edit_ips.html:29 #: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 #: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 msgid "All IP addresses are allowed." msgstr "" @@ -3888,8 +3158,6 @@ #: kallithea/templates/admin/users/user_edit_ips.html:37 #: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 #: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 msgid "New IP address" msgstr "" @@ -3902,9 +3170,6 @@ #: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 #: kallithea/tests/data/templates/base/base.html.py:247 #: kallithea/tests/data/templates/base/base.html.py:696 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 msgid "Repository Groups" msgstr "" @@ -3913,18 +3178,12 @@ #: kallithea/templates/admin/user_groups/user_group_add.html:27 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 #: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" @@ -3932,8 +3191,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:35 #: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 msgid "Copy parent group permissions" msgstr "" @@ -3941,8 +3198,6 @@ #: kallithea/templates/admin/repos/repo_add_base.html:38 #: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy permission set from parent repository group." msgstr "" @@ -3952,7 +3207,6 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "" @@ -3970,11 +3224,6 @@ #: kallithea/tests/data/templates/base/base.html.py:377 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 -#: kallithea/templates/admin/repos/repo_edit.html:40 -#: 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" msgstr "" @@ -3985,8 +3234,6 @@ #: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 #: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 #: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 msgid "Advanced" msgstr "" @@ -3995,8 +3242,6 @@ #: kallithea/templates/admin/user_groups/user_group_edit.html:31 #: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 #: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 msgid "Permissions" msgstr "" @@ -4022,14 +3267,12 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:8 #: kallithea/templates/pullrequests/pullrequest_show.html:129 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 #: kallithea/templates/data_table/_dt_elements.html:135 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 -#: kallithea/templates/data_table/_dt_elements.html:190 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -4059,7 +3302,6 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 msgid "User/User Group" msgstr "" @@ -4069,8 +3311,6 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 msgid "Default" msgstr "" @@ -4080,51 +3320,36 @@ #: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 msgid "Revoke" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 #: kallithea/templates/admin/repos/repo_edit_permissions.html:77 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 msgid "Add new" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 msgid "Apply to children" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 msgid "Both" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 -msgid "" -"Set or revoke permission to all children of that group, including non-" -"private repositories and other groups if selected." +msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 -msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 msgid "Remove this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 msgid "Confirm to delete this group" msgstr "" @@ -4150,48 +3375,35 @@ #: kallithea/templates/admin/repo_groups/repo_groups.html:41 #: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 msgid "Number of Top-level Repositories" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:12 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 -#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:16 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 -#: kallithea/templates/admin/repos/repo_add_base.html:22 -msgid "" -"Optional: URL of a remote repository. If set, the repository will be created " -"as a clone from this URL." +msgid "Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:24 #: kallithea/templates/admin/repos/repo_edit_settings.html:55 #: kallithea/templates/forks/fork.html:37 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:31 #: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/forks/fork.html:45 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 msgid "Optionally select a group to put this repository into." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:45 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 -#: kallithea/templates/admin/repos/repo_add_base.html:59 msgid "Type of repository to create." msgstr "" @@ -4199,18 +3411,12 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:35 #: kallithea/templates/forks/fork.html:50 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:52 #: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 -#: kallithea/templates/admin/repos/repo_add_base.html:68 -msgid "" -"Default revision for files page, downloads, full text search index and " -"readme generation" +msgid "Default revision for files page, downloads, full text search index and readme generation" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 @@ -4224,15 +3430,11 @@ #: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format -msgid "" -"Repository \"%(repo_name)s\" is being created, you will be redirected when " -"this process is finished.repo_name" +msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:39 -msgid "" -"We're sorry but error occurred during this operation. Please check your " -"Kallithea server logs, or contact administrator." +msgid "We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 @@ -4243,19 +3445,16 @@ #: kallithea/templates/admin/repos/repo_edit.html:34 #: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 -#: kallithea/templates/admin/repos/repo_edit.html:49 msgid "Extra Fields" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:37 #: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 -#: kallithea/templates/admin/repos/repo_edit.html:52 msgid "Caches" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 -#: kallithea/templates/admin/repos/repo_edit.html:55 msgid "Remote" msgstr "" @@ -4267,9 +3466,6 @@ #: kallithea/tests/data/templates/summary/statistics.html.py:217 #: kallithea/tests/data/templates/summary/summary.html.py:245 #: kallithea/tests/data/templates/summary/summary.html.py:249 -#: kallithea/templates/admin/repos/repo_edit.html:58 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 msgid "Statistics" msgstr "" @@ -4280,115 +3476,90 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:7 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 msgid "Manually set this repository as a fork of another from the list." msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:20 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 msgid "Public Journal Visibility" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:27 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 msgid "Remove from public journal" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:32 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 msgid "Add to Public Journal" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:37 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 -msgid "" -"All actions done in this repository will be visible to everyone in the " -"public journal." +msgid "All actions done in this repository will be visible to everyone in the public journal." msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 msgid "Change Locking" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 msgid "Confirm to unlock repository." msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:50 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Unlock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 -#: 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:56 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:58 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 msgid "Repository is not locked" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:63 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 -msgid "" -"Force locking on the repository. Works only when anonymous access is " -"disabled. Triggering a pull locks the repository. The user who is pulling " -"locks the repository; only the user who pulled and locked it can unlock it " -"by doing a push." +msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:72 #: kallithea/templates/data_table/_dt_elements.html:77 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:74 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 msgid "Delete this Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -4397,22 +3568,17 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:80 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 msgid "Detach forks" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:84 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Delete forks" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:88 #: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 -msgid "" -"The deleted repository will be moved away and hidden until the administrator " -"expires it. The administrator can both permanently delete it or restore it." +msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 @@ -4420,26 +3586,19 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:6 -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 -msgid "" -"Manually invalidate cache for this repository. On first access, the " -"repository will be cached again." +msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:9 -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:13 #: kallithea/templates/admin/repos/repo_edit_fields.html:7 -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Key" msgstr "" @@ -4454,59 +3613,43 @@ #: kallithea/tests/data/templates/admin/users/user_add.html.py:133 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 #: kallithea/tests/data/templates/admin/users/users.html.py:117 -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:6 -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 msgid "Label" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:20 -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 #, python-format msgid "Confirm to delete this field: %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:31 -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 msgid "New field key" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:38 -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 msgid "New field label" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:40 -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 msgid "Enter short label" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:45 -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 msgid "New field description" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:47 -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 msgid "Enter description of a field" msgstr "" #: kallithea/templates/admin/repos/repo_edit_fields.html:61 -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 msgid "Extra fields are disabled." msgstr "" #: kallithea/templates/admin/repos/repo_edit_permissions.html:20 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "Private Repository" msgstr "" @@ -4515,85 +3658,65 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:7 -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 msgid "Remote repository URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:15 -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 msgid "Pull Changes from Remote Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:17 -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 msgid "Confirm to pull changes from remote repository." msgstr "" #: kallithea/templates/admin/repos/repo_edit_remote.html:23 -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 msgid "This repository does not have a remote repository URL." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 msgid "Permanent Repository ID" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 msgid "What is that?" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 msgid "URL by id" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:10 -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" -"In case this repository is renamed or moved into another group the " -"repository URL changes.\n" -" Using the above permanent URL guarantees that " -"this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any other " -"cases that you need to hardcode the URL into a 3rd party service." +"In case this repository is renamed or moved into another group the repository URL changes.\n" +" Using the above permanent URL guarantees that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:16 -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:19 -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 msgid "Repository URL" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:23 -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 -msgid "" -"Optional: URL of a remote repository. If set, the repository can be pulled " -"from this URL." +msgid "Optional: URL of a remote repository. If set, the repository can be pulled from this URL." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:38 -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:46 -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 msgid "Change owner of this repository." msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:5 -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed commits" msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -4612,7 +3735,6 @@ #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/tests/data/templates/admin/repos/repos.html.py:120 -#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "" @@ -4640,7 +3762,6 @@ #: kallithea/templates/admin/settings/settings_vcs.html:4 #: kallithea/tests/data/templates/admin/settings/settings.html.py:138 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 -#: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "" @@ -4656,31 +3777,26 @@ #: kallithea/templates/admin/settings/settings_email.html:4 #: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 -#: kallithea/templates/admin/settings/settings_email.html:7 msgid "Send test email to" msgstr "" #: kallithea/templates/admin/settings/settings_email.html:12 #: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 -#: kallithea/templates/admin/settings/settings_email.html:15 msgid "Send" msgstr "" #: kallithea/templates/admin/settings/settings_global.html:4 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 -#: kallithea/templates/admin/settings/settings_global.html:8 msgid "Site branding" msgstr "" #: kallithea/templates/admin/settings/settings_global.html:7 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 -#: kallithea/templates/admin/settings/settings_global.html:12 msgid "Set a custom title for your Kallithea Service." msgstr "" #: kallithea/templates/admin/settings/settings_global.html:12 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" @@ -4691,39 +3807,27 @@ #: kallithea/templates/admin/settings/settings_global.html:22 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 -msgid "" -"HTML (possibly with JavaScript and/or CSS) that will " -"be added to the bottom of every page. This can be " -"used for web analytics systems like Google Analytics " -"or Piwik, but also to perform instance-specific " -"customizations like adding a project banner at the " -"top of every page." +msgid "HTML (possibly with JavaScript and/or CSS) that will be added to the bottom of every page. This can be used for web analytics systems like Google Analytics or Piwik, but also to perform instance-specific customizations like adding a project banner at the top of every page." msgstr "" #: kallithea/templates/admin/settings/settings_global.html:32 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 -#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "" #: kallithea/templates/admin/settings/settings_global.html:35 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 -#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "" #: kallithea/templates/admin/settings/settings_global.html:40 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 -#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "" #: kallithea/templates/admin/settings/settings_global.html:43 #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 -#: kallithea/templates/admin/settings/settings_global.html:51 -msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration." +msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." msgstr "" #: kallithea/templates/admin/settings/settings_global.html:49 @@ -4732,24 +3836,17 @@ #: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 msgid "Save Settings" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:3 #: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 -#: kallithea/templates/admin/settings/settings_hooks.html:1 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:11 #: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 -#: kallithea/templates/admin/settings/settings_hooks.html:15 -msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -4759,7 +3856,6 @@ #: kallithea/templates/admin/settings/settings_hooks.html:60 #: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 -#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "" @@ -4769,16 +3865,12 @@ #: kallithea/templates/admin/settings/settings_mapping.html:9 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 -#: kallithea/templates/admin/settings/settings_mapping.html:11 msgid "Delete records of missing repositories" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:12 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 -#: kallithea/templates/admin/settings/settings_mapping.html:13 -msgid "" -"Check this option to remove all comments, pull requests and other records " -"related to repositories that no longer exist in the filesystem." +msgid "Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -4788,128 +3880,101 @@ #: kallithea/templates/admin/settings/settings_mapping.html:20 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 -#: kallithea/templates/admin/settings/settings_mapping.html:19 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:25 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 -#: kallithea/templates/admin/settings/settings_mapping.html:23 msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 -#: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. Current " -"hooks will be updated to the latest version." +msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:32 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 -#: kallithea/templates/admin/settings/settings_mapping.html:28 msgid "Overwrite existing Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:35 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 -#: 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!" +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:41 #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 -#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "" #: kallithea/templates/admin/settings/settings_search.html:4 #: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 -#: kallithea/templates/admin/settings/settings_search.html:7 msgid "Index build option" msgstr "" #: kallithea/templates/admin/settings/settings_search.html:9 #: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 -#: kallithea/templates/admin/settings/settings_search.html:12 msgid "Build from scratch" msgstr "" #: kallithea/templates/admin/settings/settings_search.html:12 #: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 -#: kallithea/templates/admin/settings/settings_search.html:15 -msgid "" -"This option completely reindexeses all of the repositories for proper " -"fulltext search capabilities." +msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." msgstr "" #: kallithea/templates/admin/settings/settings_search.html:18 #: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 -#: kallithea/templates/admin/settings/settings_search.html:21 msgid "Reindex" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:2 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 -#: kallithea/templates/admin/settings/settings_system.html:15 msgid "Checking for updates..." msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 -#: kallithea/templates/admin/settings/settings_system.html:4 msgid "Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 -#: kallithea/templates/admin/settings/settings_system.html:4 msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 -#: kallithea/templates/admin/settings/settings_system.html:5 msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 -#: kallithea/templates/admin/settings/settings_system.html:6 msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 -#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Platform" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:11 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 -#: kallithea/templates/admin/settings/settings_system.html:8 msgid "Git version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:12 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 -#: kallithea/templates/admin/settings/settings_system.html:9 msgid "Git path" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:13 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 -#: kallithea/templates/admin/settings/settings_system.html:10 msgid "Upgrade info endpoint" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:13 #: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 -#: kallithea/templates/admin/settings/settings_system.html:10 msgid "Note: please make sure this server can access this URL" msgstr "" @@ -4920,97 +3985,76 @@ #: kallithea/templates/admin/settings/settings_vcs.html:9 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 -#: kallithea/templates/admin/settings/settings_vcs.html:24 msgid "Show repository size after push" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:15 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 -#: kallithea/templates/admin/settings/settings_vcs.html:28 msgid "Log user push commands" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:21 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 -#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Log user pull commands" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:27 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 -#: kallithea/templates/admin/settings/settings_vcs.html:36 msgid "Update repository after push (hg update)" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:33 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 -#: kallithea/templates/admin/settings/settings_vcs.html:42 msgid "Mercurial extensions" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:38 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 -#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Enable largefiles extension" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:44 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 -#: kallithea/templates/admin/settings/settings_vcs.html:51 msgid "Enable hgsubversion extension" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:47 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 -#: kallithea/templates/admin/settings/settings_vcs.html:53 -msgid "" -"Requires hgsubversion library to be installed. Enables cloning of remote " -"Subversion repositories while converting them to Mercurial." +msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 -#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 -#: kallithea/templates/admin/settings/settings_vcs.html:69 -msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:68 #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 -#: kallithea/templates/admin/settings/settings_vcs.html:72 -msgid "" -"Filesystem location where repositories are stored. After changing this " -"value, a restart and rescan of the repository folder are both required." +msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:4 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 -#: kallithea/templates/admin/settings/settings_visual.html:8 msgid "General" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:9 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 -#: kallithea/templates/admin/settings/settings_visual.html:13 msgid "Use repository extra fields" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:12 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 -#: kallithea/templates/admin/settings/settings_visual.html:15 msgid "Allows storing additional customized fields per repository." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:17 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 -#: kallithea/templates/admin/settings/settings_visual.html:18 msgid "Show Kallithea version" msgstr "" @@ -5025,46 +4069,32 @@ #: kallithea/templates/admin/settings/settings_visual.html:29 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 -#: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar URL allows you to use another avatar server application.\n" -" The following " -"variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {email} user " -"email,\n" -" {md5email} md5 hash " -"of the user email (like at gravatar.com),\n" -" {size} size of " -"the image that is expected from the server application,\n" -" {netloc} network " -"location/server host of running Kallithea server" +" The following variables of the URL will be replaced accordingly.\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {email} user email,\n" +" {md5email} md5 hash of the user email (like at gravatar.com),\n" +" {size} size of the image that is expected from the server application,\n" +" {netloc} network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:40 #: kallithea/templates/summary/summary.html:62 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 #: kallithea/tests/data/templates/summary/summary.html.py:133 -#: kallithea/templates/summary/summary.html:72 msgid "Clone URL" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following variables " -"are available:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" -" {user} current user " -"username,\n" -" {netloc} network " -"location/server host of running Kallithea server,\n" -" {repo} full repository " -"name,\n" -" {repoid} ID of " -"repository, can be used to construct clone-by-id" +" The following variables are available:\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {user} current user username,\n" +" {netloc} network location/server host of running Kallithea server,\n" +" {repo} full repository name,\n" +" {repoid} ID of repository, can be used to construct clone-by-id" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:54 @@ -5072,8 +4102,7 @@ msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:57 -msgid "" -"Number of items displayed in the repository pages before pagination is shown." +msgid "Number of items displayed in the repository pages before pagination is shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:62 @@ -5082,53 +4111,41 @@ #: kallithea/templates/admin/settings/settings_visual.html:65 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 -#: kallithea/templates/admin/settings/settings_visual.html:69 -msgid "" -"Number of items displayed in the admin pages grids before pagination is " -"shown." +msgid "Number of items displayed in the admin pages grids before pagination is shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:70 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 -#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:75 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 -#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:81 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 -#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repository icon on repositories" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:84 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:89 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 -#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta Tagging" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:94 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 -#: kallithea/templates/admin/settings/settings_visual.html:111 -msgid "" -"Parses meta tags from the repository description field and turns them into " -"colored tags." +msgid "Parses meta tags from the repository description field and turns them into colored tags." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:98 #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 -#: kallithea/templates/admin/settings/settings_visual.html:97 msgid "Stylify recognised meta tags:" msgstr "" @@ -5144,22 +4161,17 @@ #: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 #: kallithea/tests/data/templates/base/base.html.py:255 #: kallithea/tests/data/templates/base/base.html.py:702 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 #: kallithea/templates/admin/user_groups/user_groups.html:24 #: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 -#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "" @@ -5183,15 +4195,12 @@ #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 #: kallithea/templates/admin/user_groups/user_groups.html:40 #: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 #: kallithea/templates/data_table/_dt_elements.html:120 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 -#: kallithea/templates/data_table/_dt_elements.html:174 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -5201,17 +4210,14 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 msgid "Chosen group members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "" @@ -5233,8 +4239,6 @@ #: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 #: kallithea/tests/data/templates/admin/users/users.html.py:145 #: kallithea/tests/data/templates/base/base.html.py:251 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "" @@ -5242,13 +4246,11 @@ #: kallithea/templates/admin/users/users.html:23 #: kallithea/tests/data/templates/admin/users/user_add.html.py:167 #: kallithea/tests/data/templates/admin/users/users.html.py:105 -#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "" #: kallithea/templates/admin/users/user_add.html:41 #: kallithea/tests/data/templates/admin/users/user_add.html.py:117 -#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "" @@ -5271,14 +4273,12 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_profile.html:32 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 -#: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 #: kallithea/templates/admin/users/users.html:41 #: kallithea/tests/data/templates/admin/users/users.html.py:115 -#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "" @@ -5289,7 +4289,6 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:21 #: kallithea/templates/data_table/_dt_elements.html:105 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 -#: kallithea/templates/data_table/_dt_elements.html:158 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -5300,20 +4299,17 @@ #: kallithea/templates/admin/users/user_edit_ips.html:7 #: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 -#: kallithea/templates/admin/users/user_edit_ips.html:8 #, python-format msgid "Inherited from %s" msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:39 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 -#: kallithea/templates/admin/users/user_edit_profile.html:51 msgid "Name in Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:53 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 -#: kallithea/templates/admin/users/user_edit_profile.html:69 msgid "New password confirmation" msgstr "" @@ -5324,38 +4320,32 @@ #: kallithea/templates/admin/users/users.html:44 #: kallithea/tests/data/templates/admin/users/users.html.py:121 -#: kallithea/templates/admin/users/users.html:56 msgid "Auth Type" msgstr "" #: kallithea/templates/base/base.html:16 #: kallithea/tests/data/templates/base/base.html.py:59 -#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "" #: kallithea/templates/base/base.html:28 #: kallithea/tests/data/templates/base/base.html.py:78 -#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "" #: kallithea/templates/base/base.html:86 #: kallithea/tests/data/templates/base/base.html.py:213 -#: kallithea/templates/base/base.html:90 msgid "Mercurial repository" msgstr "" #: kallithea/templates/base/base.html:89 #: kallithea/tests/data/templates/base/base.html.py:217 -#: kallithea/templates/base/base.html:93 msgid "Git repository" msgstr "" #: kallithea/templates/base/base.html:114 #: kallithea/tests/data/templates/base/base.html.py:322 -#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "" @@ -5365,9 +4355,6 @@ #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 #: kallithea/tests/data/templates/summary/summary.html.py:357 -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 msgid "Summary" msgstr "" @@ -5379,10 +4366,6 @@ #: kallithea/tests/data/templates/changelog/changelog.html.py:321 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "" @@ -5392,9 +4375,6 @@ #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 #: kallithea/tests/data/templates/files/files.html.py:184 -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 msgid "Files" msgstr "" @@ -5402,8 +4382,6 @@ #: kallithea/templates/base/base.html:139 #: kallithea/tests/data/templates/base/base.html.py:366 #: kallithea/tests/data/templates/base/base.html.py:370 -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 msgid "Options" msgstr "" @@ -5411,20 +4389,11 @@ #: kallithea/templates/forks/forks_data.html:18 #: kallithea/tests/data/templates/base/base.html.py:383 #: kallithea/tests/data/templates/forks/forks_data.html.py:59 -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" #: kallithea/templates/base/base.html:149 #: kallithea/tests/data/templates/base/base.html.py:388 -#: 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 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "" @@ -5436,33 +4405,26 @@ #: kallithea/tests/data/templates/base/base.html.py:544 #: kallithea/tests/data/templates/search/search.html.py:134 #: kallithea/tests/data/templates/search/search.html.py:185 -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 -#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" #: kallithea/templates/base/base.html:155 #: kallithea/tests/data/templates/base/base.html.py:399 -#: kallithea/templates/base/base.html:163 msgid "Unlock" msgstr "" #: kallithea/templates/base/base.html:157 #: kallithea/tests/data/templates/base/base.html.py:405 -#: kallithea/templates/base/base.html:165 msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:165 #: kallithea/tests/data/templates/base/base.html.py:413 -#: kallithea/templates/base/base.html:173 msgid "Follow" msgstr "" #: kallithea/templates/base/base.html:166 #: kallithea/tests/data/templates/base/base.html.py:415 -#: kallithea/templates/base/base.html:174 msgid "Unfollow" msgstr "" @@ -5470,9 +4432,6 @@ #: kallithea/tests/data/templates/base/base.html.py:419 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 msgid "Fork" msgstr "" @@ -5480,21 +4439,17 @@ #: kallithea/templates/pullrequests/pullrequest.html:77 #: kallithea/tests/data/templates/base/base.html.py:423 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 #: kallithea/tests/data/templates/base/base.html.py:430 -#: kallithea/templates/base/base.html:183 #, python-format msgid "Show Pull Requests for %s" msgstr "" #: kallithea/templates/base/base.html:188 #: kallithea/tests/data/templates/base/base.html.py:439 -#: kallithea/templates/base/base.html:138 msgid "Switch To" msgstr "" @@ -5502,13 +4457,11 @@ #: kallithea/templates/base/base.html:458 #: kallithea/tests/data/templates/base/base.html.py:441 #: kallithea/tests/data/templates/base/base.html.py:656 -#: kallithea/templates/base/base.html:395 msgid "No matches found" msgstr "" #: kallithea/templates/base/base.html:294 #: kallithea/tests/data/templates/base/base.html.py:494 -#: kallithea/templates/base/base.html:221 msgid "Show recent activity" msgstr "" @@ -5516,44 +4469,36 @@ #: kallithea/templates/base/base.html:301 #: kallithea/tests/data/templates/base/base.html.py:504 #: kallithea/tests/data/templates/base/base.html.py:508 -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 msgid "Public journal" msgstr "" #: kallithea/templates/base/base.html:306 #: kallithea/tests/data/templates/base/base.html.py:513 -#: kallithea/templates/base/base.html:233 msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:307 #: kallithea/tests/data/templates/base/base.html.py:517 -#: kallithea/templates/base/base.html:234 msgid "Gists" msgstr "" #: kallithea/templates/base/base.html:311 #: kallithea/tests/data/templates/base/base.html.py:525 -#: kallithea/templates/base/base.html:238 msgid "All Public Gists" msgstr "" #: kallithea/templates/base/base.html:313 #: kallithea/tests/data/templates/base/base.html.py:531 -#: kallithea/templates/base/base.html:240 msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:314 #: kallithea/tests/data/templates/base/base.html.py:535 -#: kallithea/templates/base/base.html:241 msgid "My Private Gists" msgstr "" #: kallithea/templates/base/base.html:319 #: kallithea/tests/data/templates/base/base.html.py:540 -#: kallithea/templates/base/base.html:246 msgid "Search in repositories" msgstr "" @@ -5563,20 +4508,16 @@ #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #: kallithea/tests/data/templates/base/base.html.py:573 #: kallithea/tests/data/templates/base/base.html.py:577 -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 msgid "My Pull Requests" msgstr "" #: kallithea/templates/base/base.html:367 #: kallithea/tests/data/templates/base/base.html.py:602 -#: kallithea/templates/base/base.html:289 msgid "Not Logged In" msgstr "" #: kallithea/templates/base/base.html:375 #: kallithea/tests/data/templates/base/base.html.py:607 -#: kallithea/templates/base/base.html:296 msgid "Login to Your Account" msgstr "" @@ -5590,57 +4531,47 @@ #: kallithea/templates/base/base.html:407 #: kallithea/tests/data/templates/base/base.html.py:648 -#: kallithea/templates/base/base.html:346 msgid "Log Out" msgstr "" #: kallithea/templates/base/default_perms_box.html:11 #: kallithea/tests/data/templates/base/default_perms_box.html.py:47 -#: kallithea/templates/base/default_perms_box.html:14 msgid "Inherit defaults" msgstr "" #: kallithea/templates/base/default_perms_box.html:15 #: kallithea/tests/data/templates/base/default_perms_box.html.py:51 -#: kallithea/templates/base/default_perms_box.html:19 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the %s." +#, python-format +msgid "Select to inherit global settings, IP whitelist and permissions from the %s." msgstr "" #: kallithea/templates/base/default_perms_box.html:23 #: kallithea/tests/data/templates/base/default_perms_box.html.py:54 -#: kallithea/templates/base/default_perms_box.html:28 msgid "Create repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:27 #: kallithea/tests/data/templates/base/default_perms_box.html.py:58 -#: kallithea/templates/base/default_perms_box.html:33 msgid "Select this option to allow repository creation for this user" msgstr "" #: kallithea/templates/base/default_perms_box.html:33 #: kallithea/tests/data/templates/base/default_perms_box.html.py:60 -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" #: kallithea/templates/base/default_perms_box.html:37 #: kallithea/tests/data/templates/base/default_perms_box.html.py:64 -#: kallithea/templates/base/default_perms_box.html:45 msgid "Select this option to allow user group creation for this user" msgstr "" #: kallithea/templates/base/default_perms_box.html:43 #: kallithea/tests/data/templates/base/default_perms_box.html.py:66 -#: kallithea/templates/base/default_perms_box.html:52 msgid "Fork repositories" msgstr "" #: kallithea/templates/base/default_perms_box.html:47 #: kallithea/tests/data/templates/base/default_perms_box.html.py:70 -#: kallithea/templates/base/default_perms_box.html:57 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -5648,7 +4579,6 @@ #: kallithea/templates/changelog/changelog.html:39 #: kallithea/tests/data/templates/base/perms_summary.html.py:51 #: kallithea/tests/data/templates/changelog/changelog.html.py:128 -#: kallithea/templates/changelog/changelog.html:42 msgid "Show" msgstr "" @@ -5661,7 +4591,6 @@ #: kallithea/templates/base/perms_summary.html:55 #: kallithea/tests/data/templates/base/perms_summary.html.py:90 #: kallithea/tests/data/templates/base/perms_summary.html.py:113 -#: kallithea/templates/base/perms_summary.html:54 msgid "Permission" msgstr "" @@ -5669,93 +4598,77 @@ #: kallithea/templates/base/perms_summary.html:57 #: kallithea/tests/data/templates/base/perms_summary.html.py:94 #: kallithea/tests/data/templates/base/perms_summary.html.py:117 -#: kallithea/templates/base/perms_summary.html:56 msgid "Edit Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:92 #: kallithea/tests/data/templates/base/perms_summary.html.py:169 -#: kallithea/templates/base/perms_summary.html:90 msgid "No permission defined" msgstr "" #: kallithea/templates/base/root.html:25 #: kallithea/tests/data/templates/base/root.html.py:85 -#: kallithea/templates/base/root.html:22 msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 #: kallithea/tests/data/templates/base/root.html.py:87 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 #: kallithea/tests/data/templates/base/root.html.py:89 -#: kallithea/templates/base/root.html:24 msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 #: kallithea/tests/data/templates/base/root.html.py:91 -#: kallithea/templates/base/root.html:25 msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 #: kallithea/tests/data/templates/base/root.html.py:93 -#: kallithea/templates/base/root.html:26 msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 #: kallithea/tests/data/templates/base/root.html.py:95 -#: kallithea/templates/base/root.html:27 msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 #: kallithea/tests/data/templates/base/root.html.py:97 -#: kallithea/templates/base/root.html:28 msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:32 #: kallithea/tests/data/templates/base/root.html.py:99 -#: kallithea/templates/base/root.html:29 msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 #: kallithea/tests/data/templates/base/root.html.py:101 -#: kallithea/templates/base/root.html:30 msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 #: kallithea/tests/data/templates/base/root.html.py:103 -#: kallithea/templates/base/root.html:31 msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:35 #: kallithea/tests/data/templates/base/root.html.py:105 -#: kallithea/templates/base/root.html:32 msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 #: kallithea/tests/data/templates/base/root.html.py:107 -#: kallithea/templates/base/root.html:33 msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 #: kallithea/tests/data/templates/base/root.html.py:109 -#: kallithea/templates/base/root.html:34 msgid "Selection Link" msgstr "" @@ -5764,108 +4677,57 @@ #: kallithea/tests/data/templates/base/root.html.py:111 #: kallithea/tests/data/templates/changeset/diff_block.html.py:55 #: kallithea/tests/data/templates/changeset/diff_block.html.py:230 -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 #: kallithea/tests/data/templates/base/root.html.py:113 -#: kallithea/templates/base/root.html:36 msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 #: kallithea/tests/data/templates/base/root.html.py:115 -#: kallithea/templates/base/root.html:37 msgid "Failed to revoke permission" msgstr "" #: kallithea/templates/base/root.html:41 #: kallithea/tests/data/templates/base/root.html.py:117 -#: kallithea/templates/base/root.html:38 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" #: kallithea/templates/base/root.html:44 #: kallithea/templates/compare/compare_diff.html:108 #: kallithea/tests/data/templates/base/root.html.py:123 -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Velg endringssett" #: kallithea/templates/base/root.html:45 #: kallithea/tests/data/templates/base/root.html.py:125 -#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "" #: kallithea/templates/base/root.html:46 #: kallithea/tests/data/templates/base/root.html.py:127 -#: 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:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 msgid "Click to sort ascending" msgstr "" #: kallithea/templates/base/root.html:47 #: kallithea/tests/data/templates/base/root.html.py:129 -#: 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:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 msgid "Click to sort descending" msgstr "" #: kallithea/templates/base/root.html:48 #: kallithea/tests/data/templates/base/root.html.py:131 -#: 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:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 msgid "No records found." msgstr "" #: kallithea/templates/base/root.html:49 #: kallithea/tests/data/templates/base/root.html.py:133 -#: 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:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 msgid "Data error." msgstr "" #: kallithea/templates/base/root.html:50 #: kallithea/tests/data/templates/base/root.html.py:135 -#: 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: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 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 msgid "Loading..." msgstr "" @@ -5885,13 +4747,11 @@ #: kallithea/templates/changelog/changelog.html:45 #: kallithea/tests/data/templates/changelog/changelog.html.py:141 -#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "" #: kallithea/templates/changelog/changelog.html:52 #: kallithea/tests/data/templates/changelog/changelog.html.py:147 -#: kallithea/templates/changelog/changelog.html:55 msgid "Go to tip of repository" msgstr "" @@ -5899,15 +4759,12 @@ #: kallithea/templates/forks/forks_data.html:16 #: kallithea/tests/data/templates/changelog/changelog.html.py:151 #: kallithea/tests/data/templates/forks/forks_data.html.py:55 -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" #: kallithea/templates/changelog/changelog.html:59 #: kallithea/tests/data/templates/changelog/changelog.html.py:155 -#: kallithea/templates/changelog/changelog.html:62 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" @@ -5916,7 +4773,6 @@ #: kallithea/templates/files/files.html:29 #: kallithea/tests/data/templates/changelog/changelog.html.py:158 #: kallithea/tests/data/templates/files/files.html.py:117 -#: kallithea/templates/changelog/changelog.html:66 msgid "Branch filter:" msgstr "" @@ -5942,8 +4798,6 @@ #: kallithea/templates/compare/compare_cs.html:76 #: kallithea/tests/data/templates/changelog/changelog.html.py:217 #: kallithea/tests/data/templates/compare/compare_cs.html.py:116 -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 msgid "Expand commit message" msgstr "" @@ -5951,8 +4805,6 @@ #: kallithea/templates/compare/compare_cs.html:41 #: kallithea/tests/data/templates/changelog/changelog.html.py:225 #: kallithea/tests/data/templates/compare/compare_cs.html.py:71 -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 msgid "Changeset has comments" msgstr "" @@ -5964,10 +4816,6 @@ #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 #: kallithea/tests/data/templates/changeset/changeset.html.py:216 #: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "" @@ -5984,10 +4832,6 @@ #: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 #: kallithea/tests/data/templates/compare/compare_cs.html.py:120 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 #, python-format msgid "Tag %s" msgstr "" @@ -6000,31 +4844,24 @@ #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 #: kallithea/tests/data/templates/changeset/changeset.html.py:230 #: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "" #: kallithea/templates/changelog/changelog.html:326 #: kallithea/tests/data/templates/changelog/changelog.html.py:289 -#: kallithea/templates/changelog/changelog.html:309 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 #: kallithea/templates/changeset/changeset.html:98 #: kallithea/tests/data/templates/changeset/changeset.html.py:187 -#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 #: kallithea/templates/changeset/changeset.html:99 #: kallithea/tests/data/templates/changeset/changeset.html.py:191 -#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "" @@ -6033,8 +4870,6 @@ #: kallithea/templates/changeset/diff_block.html:38 #: kallithea/tests/data/templates/changeset/changeset.html.py:195 #: kallithea/tests/data/templates/changeset/diff_block.html.py:110 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 msgid "Added" msgstr "" @@ -6047,9 +4882,6 @@ #: kallithea/tests/data/templates/changeset/changeset.html.py:201 #: kallithea/tests/data/templates/changeset/changeset.html.py:203 #: kallithea/tests/data/templates/changeset/changeset.html.py:205 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "" @@ -6062,14 +4894,6 @@ #: kallithea/tests/data/templates/files/files_browser.html.py:52 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 msgid "Revision" msgstr "" @@ -6079,9 +4903,6 @@ #: kallithea/templates/files/files_edit.html:67 #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 #: kallithea/tests/data/templates/files/files_add.html.py:243 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 msgid "Commit Message" msgstr "" @@ -6093,12 +4914,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:10 #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 msgid "Author" msgstr "" @@ -6109,7 +4924,6 @@ #: kallithea/templates/changelog/changelog_summary_data.html:79 #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 -#: kallithea/templates/changelog/changelog_summary_data.html:81 msgid "Add or upload files directly via Kallithea" msgstr "" @@ -6119,19 +4933,16 @@ #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 #: kallithea/tests/data/templates/files/files_add.html.py:159 #: kallithea/tests/data/templates/files/files_ypjax.html.py:46 -#: kallithea/templates/changelog/changelog_summary_data.html:84 msgid "Add New File" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:88 #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 -#: kallithea/templates/changelog/changelog_summary_data.html:90 msgid "Push new repository" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:96 #: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 -#: kallithea/templates/changelog/changelog_summary_data.html:98 msgid "Existing repository?" msgstr "" @@ -6155,9 +4966,6 @@ #: kallithea/tests/data/templates/changeset/changeset.html.py:162 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 #: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" @@ -6166,8 +4974,6 @@ #: kallithea/templates/files/diff_2way.html:47 #: kallithea/tests/data/templates/changeset/changeset.html.py:169 #: kallithea/tests/data/templates/changeset/diff_block.html.py:161 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" @@ -6181,8 +4987,6 @@ #: kallithea/templates/files/diff_2way.html:50 #: kallithea/tests/data/templates/changeset/changeset.html.py:177 #: kallithea/tests/data/templates/changeset/diff_block.html.py:165 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" @@ -6190,32 +4994,26 @@ #: kallithea/templates/changeset/changeset_range.html:80 #: kallithea/tests/data/templates/changeset/changeset.html.py:210 #: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 msgid "Merge" msgstr "" #: kallithea/templates/changeset/changeset.html:117 #: kallithea/tests/data/templates/changeset/changeset.html.py:250 -#: kallithea/templates/changeset/changeset.html:123 msgid "Grafted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:123 #: kallithea/tests/data/templates/changeset/changeset.html.py:260 -#: kallithea/templates/changeset/changeset.html:129 msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 #: kallithea/tests/data/templates/changeset/changeset.html.py:267 -#: kallithea/templates/changeset/changeset.html:135 msgid "Replaced by:" msgstr "" #: kallithea/templates/changeset/changeset.html:143 #: kallithea/tests/data/templates/changeset/changeset.html.py:288 -#: kallithea/templates/changeset/changeset.html:149 msgid "Preceded by:" msgstr "" @@ -6225,9 +5023,6 @@ #: kallithea/tests/data/templates/changeset/changeset.html.py:311 #: kallithea/tests/data/templates/compare/compare_diff.html.py:152 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -6240,9 +5035,6 @@ #: kallithea/tests/data/templates/changeset/changeset.html.py:315 #: kallithea/tests/data/templates/compare/compare_diff.html.py:156 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: 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" @@ -6258,9 +5050,6 @@ #: kallithea/tests/data/templates/changeset/changeset.html.py:351 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 msgid "Show full diff anyway" msgstr "" @@ -6268,32 +5057,26 @@ #: kallithea/templates/changeset/changeset.html:270 #: kallithea/tests/data/templates/changeset/changeset.html.py:368 #: kallithea/tests/data/templates/changeset/changeset.html.py:378 -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 msgid "No revisions" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:19 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 -#: kallithea/templates/changeset/changeset_file_comment.html:21 msgid "on pull request" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:20 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 -#: kallithea/templates/changeset/changeset_file_comment.html:22 msgid "No title" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:22 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 -#: kallithea/templates/changeset/changeset_file_comment.html:24 msgid "on this changeset" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:29 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 -#: kallithea/templates/changeset/changeset_file_comment.html:30 msgid "Delete comment?" msgstr "" @@ -6309,27 +5092,22 @@ #: kallithea/templates/changeset/changeset_file_comment.html:58 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 -msgid "" -"Comments are in plain text. Use @username inside this text to notify another " -"user." +msgid "Comments are in plain text. Use @username inside this text to notify another user." msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:65 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 -#: kallithea/templates/changeset/changeset_file_comment.html:159 msgid "Set changeset status" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 -#: kallithea/templates/changeset/changeset_file_comment.html:157 msgid "Vote for pull request status" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:73 #: kallithea/templates/changeset/diff_block.html:46 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 -#: kallithea/templates/changeset/changeset_file_comment.html:163 msgid "No change" msgstr "" @@ -6340,44 +5118,36 @@ #: kallithea/templates/changeset/changeset_file_comment.html:89 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 -#: kallithea/templates/changeset/changeset_file_comment.html:176 msgid "Close" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:101 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 -#: kallithea/templates/changeset/changeset_file_comment.html:77 msgid "Submitting ..." msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:102 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 msgid "Comment" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:110 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 -#: kallithea/templates/changeset/changeset_file_comment.html:90 msgid "You need to be logged in to comment." msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:110 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 -#: kallithea/templates/changeset/changeset_file_comment.html:90 msgid "Login now" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:114 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 -#: kallithea/templates/changeset/changeset_file_comment.html:94 msgid "Hide" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:126 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 -#: kallithea/templates/changeset/changeset_file_comment.html:106 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -6386,7 +5156,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:127 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 -#: kallithea/templates/changeset/changeset_file_comment.html:107 #, python-format msgid "%d inline" msgid_plural "%d inline" @@ -6395,7 +5164,6 @@ #: kallithea/templates/changeset/changeset_file_comment.html:128 #: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 -#: kallithea/templates/changeset/changeset_file_comment.html:108 #, python-format msgid "%d general" msgid_plural "%d general" @@ -6411,15 +5179,12 @@ #: kallithea/templates/changeset/changeset_range.html:43 #: kallithea/templates/compare/compare_cs.html:37 #: kallithea/tests/data/templates/compare/compare_cs.html.py:65 -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 #, python-format msgid "Changeset status: %s" msgstr "" #: kallithea/templates/changeset/changeset_range.html:50 #: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 -#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "" @@ -6437,13 +5202,11 @@ #: kallithea/templates/changeset/diff_block.html:42 #: kallithea/tests/data/templates/changeset/diff_block.html.py:128 -#: kallithea/templates/changeset/diff_block.html:86 msgid "Deleted" msgstr "" #: kallithea/templates/changeset/diff_block.html:44 #: kallithea/tests/data/templates/changeset/diff_block.html.py:136 -#: kallithea/templates/changeset/diff_block.html:89 msgid "Renamed" msgstr "" @@ -6463,23 +5226,17 @@ #: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:41 #: kallithea/tests/data/templates/changeset/diff_block.html.py:153 -#: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:62 #: kallithea/templates/files/diff_2way.html:44 #: kallithea/tests/data/templates/changeset/diff_block.html.py:157 -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" #: kallithea/templates/changeset/diff_block.html:72 #: kallithea/tests/data/templates/changeset/diff_block.html.py:171 -#: kallithea/templates/changeset/diff_block.html:38 msgid "Show inline comments" msgstr "" @@ -6493,8 +5250,7 @@ msgstr "" #: kallithea/templates/compare/compare_cs.html:14 -msgid "" -"Please merge the target branch to your branch before creating a pull request." +msgid "Please merge the target branch to your branch before creating a pull request." msgstr "" #: kallithea/templates/compare/compare_cs.html:18 @@ -6503,44 +5259,37 @@ #: kallithea/templates/compare/compare_cs.html:55 #: kallithea/tests/data/templates/compare/compare_cs.html.py:82 -#: kallithea/templates/compare/compare_cs.html:44 msgid "First (oldest) changeset in this list" msgstr "" #: kallithea/templates/compare/compare_cs.html:57 #: kallithea/tests/data/templates/compare/compare_cs.html.py:84 -#: kallithea/templates/compare/compare_cs.html:46 msgid "Last (most recent) changeset in this list" msgstr "" #: kallithea/templates/compare/compare_cs.html:59 #: kallithea/tests/data/templates/compare/compare_cs.html.py:86 -#: kallithea/templates/compare/compare_cs.html:48 msgid "Position in this list of changesets" msgstr "" #: kallithea/templates/compare/compare_cs.html:98 #: kallithea/tests/data/templates/compare/compare_cs.html.py:133 -#: kallithea/templates/compare/compare_cs.html:76 msgid "Show merge diff" msgstr "" #: kallithea/templates/compare/compare_cs.html:112 #: kallithea/tests/data/templates/compare/compare_cs.html.py:157 -#: kallithea/templates/compare/compare_cs.html:98 msgid "is" msgstr "" #: kallithea/templates/compare/compare_cs.html:113 #: kallithea/tests/data/templates/compare/compare_cs.html.py:161 -#: kallithea/templates/compare/compare_cs.html:99 #, python-format msgid "%s changesets" msgstr "" #: kallithea/templates/compare/compare_cs.html:114 #: kallithea/tests/data/templates/compare/compare_cs.html.py:163 -#: kallithea/templates/compare/compare_cs.html:100 msgid "behind" msgstr "" @@ -6556,19 +5305,16 @@ #: kallithea/templates/compare/compare_diff.html:41 #: kallithea/tests/data/templates/compare/compare_diff.html.py:136 #: kallithea/tests/data/templates/compare/compare_diff.html.py:226 -#: kallithea/templates/compare/compare_diff.html:35 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 #: kallithea/tests/data/templates/compare/compare_diff.html.py:133 -#: kallithea/templates/compare/compare_diff.html:33 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 #: kallithea/tests/data/templates/compare/compare_diff.html.py:140 -#: kallithea/templates/compare/compare_diff.html:42 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" @@ -6576,8 +5322,6 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:291 #: kallithea/tests/data/templates/compare/compare_diff.html.py:145 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -6587,26 +5331,21 @@ #: kallithea/templates/compare/compare_diff.html:95 #: kallithea/tests/data/templates/compare/compare_diff.html.py:184 #: kallithea/tests/data/templates/compare/compare_diff.html.py:199 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 msgid "Show full diff" msgstr "" #: kallithea/templates/data_table/_dt_elements.html:20 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 -#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Public repository" msgstr "" #: kallithea/templates/data_table/_dt_elements.html:31 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 -#: kallithea/templates/data_table/_dt_elements.html:84 msgid "Repository creation in progress..." msgstr "" #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 -#: kallithea/templates/data_table/_dt_elements.html:98 msgid "No changesets yet" msgstr "" @@ -6614,8 +5353,6 @@ #: kallithea/templates/data_table/_dt_elements.html:54 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 #, python-format msgid "Subscribe to %s rss feed" msgstr "" @@ -6624,15 +5361,12 @@ #: kallithea/templates/data_table/_dt_elements.html:62 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 #, python-format msgid "Subscribe to %s atom feed" msgstr "" #: kallithea/templates/data_table/_dt_elements.html:86 #: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 -#: kallithea/templates/data_table/_dt_elements.html:139 msgid "Creating" msgstr "" @@ -6673,7 +5407,6 @@ #: kallithea/templates/email_templates/password_reset.html:9 #: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 #: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 -#: kallithea/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" msgstr "" @@ -6681,41 +5414,31 @@ #: kallithea/templates/email_templates/password_reset.html:16 #: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 #: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 -#: kallithea/templates/email_templates/password_reset.html:6 msgid "We have received a request to reset the password for your account." msgstr "" #: kallithea/templates/email_templates/password_reset.html:25 #: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 #: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 -msgid "" -"This account is however managed outside this system and the password cannot " -"be changed here." +msgid "This account is however managed outside this system and the password cannot be changed here." msgstr "" #: kallithea/templates/email_templates/password_reset.html:28 #: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 #: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 -#: kallithea/templates/email_templates/password_reset.html:7 msgid "To set a new password, click the following link" msgstr "" #: kallithea/templates/email_templates/password_reset.html:33 #: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 #: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 -#: kallithea/templates/email_templates/password_reset.html:10 -msgid "" -"Should you not be able to use the link above, please type the following code " -"into the password reset form" +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:44 #: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 #: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 -#: kallithea/templates/email_templates/password_reset.html:12 -msgid "" -"If it weren't you who requested the password reset, just disregard this " -"message." +msgid "If it weren't you who requested the password reset, just disregard this message." msgstr "" #: kallithea/templates/email_templates/pull_request.html:4 @@ -6781,7 +5504,6 @@ #: kallithea/templates/files/files.html:77 #: kallithea/tests/data/templates/files/files.html.py:138 #: kallithea/tests/data/templates/files/files.html.py:218 -#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "" @@ -6797,14 +5519,11 @@ #: kallithea/templates/files/files_ypjax.html:3 #: kallithea/tests/data/templates/files/files_add.html.py:225 #: kallithea/tests/data/templates/files/files_ypjax.html.py:35 -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 msgid "Location" msgstr "" #: kallithea/templates/files/files_add.html:41 #: kallithea/tests/data/templates/files/files_add.html.py:229 -#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "" @@ -6812,20 +5531,16 @@ #: kallithea/templates/files/files_add.html:47 #: kallithea/tests/data/templates/files/files_add.html.py:233 #: kallithea/tests/data/templates/files/files_add.html.py:237 -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "" #: kallithea/templates/files/files_add.html:43 #: kallithea/tests/data/templates/files/files_add.html.py:235 -#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "" #: kallithea/templates/files/files_add.html:47 #: kallithea/tests/data/templates/files/files_add.html.py:239 -#: kallithea/templates/files/files_add.html:48 msgid "Create New File" msgstr "" @@ -6838,9 +5553,6 @@ #: kallithea/templates/files/files_delete.html:40 #: kallithea/templates/files/files_edit.html:71 #: kallithea/tests/data/templates/files/files_add.html.py:247 -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 msgid "Commit Changes" msgstr "" @@ -6856,44 +5568,37 @@ #: kallithea/templates/files/files_browser.html:42 #: kallithea/tests/data/templates/files/files_browser.html.py:68 -#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "" #: kallithea/templates/files/files_browser.html:46 #: kallithea/tests/data/templates/files/files_browser.html.py:70 -#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "" #: kallithea/templates/files/files_browser.html:50 #: kallithea/tests/data/templates/files/files_browser.html.py:72 -#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "" #: kallithea/templates/files/files_browser.html:63 #: kallithea/templates/summary/summary.html:144 #: kallithea/tests/data/templates/files/files_browser.html.py:78 -#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 #: kallithea/tests/data/templates/files/files_browser.html.py:80 -#: kallithea/templates/files/files_browser.html:62 msgid "Last Revision" msgstr "" #: kallithea/templates/files/files_browser.html:65 #: kallithea/tests/data/templates/files/files_browser.html.py:82 -#: kallithea/templates/files/files_browser.html:63 msgid "Last Modified" msgstr "" #: kallithea/templates/files/files_browser.html:66 #: kallithea/tests/data/templates/files/files_browser.html.py:84 -#: kallithea/templates/files/files_browser.html:64 msgid "Last Committer" msgstr "" @@ -6904,7 +5609,6 @@ #: kallithea/templates/files/files_delete.html:12 #: kallithea/templates/files/files_delete.html:30 -#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "" @@ -6920,21 +5624,16 @@ #: kallithea/templates/files/files_edit.html:51 #: kallithea/templates/files/files_source.html:28 #: kallithea/tests/data/templates/files/files_source.html.py:70 -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 msgid "Show Annotation" msgstr "" #: kallithea/templates/files/files_edit.html:53 #: kallithea/templates/files/files_source.html:31 #: kallithea/tests/data/templates/files/files_source.html.py:75 -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 msgid "Download as Raw" msgstr "" #: kallithea/templates/files/files_edit.html:56 -#: kallithea/templates/files/files_edit.html:53 msgid "Source" msgstr "" @@ -6948,31 +5647,26 @@ #: kallithea/templates/files/files_source.html:6 #: kallithea/tests/data/templates/files/files_source.html.py:44 -#: kallithea/templates/files/files_source.html:7 msgid "Diff to Revision" msgstr "" #: kallithea/templates/files/files_source.html:7 #: kallithea/tests/data/templates/files/files_source.html.py:46 -#: kallithea/templates/files/files_source.html:8 msgid "Show at Revision" msgstr "" #: kallithea/templates/files/files_source.html:9 #: kallithea/tests/data/templates/files/files_source.html.py:50 -#: kallithea/templates/files/files_source.html:10 msgid "Show Full History" msgstr "" #: kallithea/templates/files/files_source.html:10 #: kallithea/tests/data/templates/files/files_source.html.py:52 -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" #: kallithea/templates/files/files_source.html:26 #: kallithea/tests/data/templates/files/files_source.html.py:66 -#: kallithea/templates/files/files_source.html:30 msgid "Show Source" msgstr "" @@ -6983,25 +5677,21 @@ #: kallithea/templates/files/files_source.html:37 #: kallithea/tests/data/templates/files/files_source.html.py:86 -#: kallithea/templates/files/files_source.html:41 msgid "Editing binary files not allowed" msgstr "" #: kallithea/templates/files/files_source.html:40 #: kallithea/tests/data/templates/files/files_source.html.py:92 -#: kallithea/templates/files/files_source.html:44 msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 #: kallithea/tests/data/templates/files/files_source.html.py:94 -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:58 #: kallithea/tests/data/templates/files/files_source.html.py:111 -#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "" @@ -7048,14 +5738,11 @@ #: kallithea/tests/data/templates/followers/followers.html.py:113 #: kallithea/tests/data/templates/summary/summary.html.py:207 #: kallithea/tests/data/templates/summary/summary.html.py:211 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 msgid "Followers" msgstr "" #: kallithea/templates/followers/followers_data.html:9 #: kallithea/tests/data/templates/followers/followers_data.html.py:44 -#: kallithea/templates/followers/followers_data.html:12 msgid "Started following -" msgstr "" @@ -7065,42 +5752,34 @@ msgstr "" #: kallithea/templates/forks/fork.html:25 -#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "" #: kallithea/templates/forks/fork.html:53 -#: kallithea/templates/forks/fork.html:62 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" #: kallithea/templates/forks/fork.html:58 -#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "" #: kallithea/templates/forks/fork.html:66 -#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "" #: kallithea/templates/forks/fork.html:69 -#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "" #: kallithea/templates/forks/fork.html:75 -#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "" #: kallithea/templates/forks/fork.html:78 -#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "" #: kallithea/templates/forks/fork.html:85 -#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "" @@ -7116,44 +5795,36 @@ #: kallithea/tests/data/templates/forks/forks.html.py:113 #: kallithea/tests/data/templates/summary/summary.html.py:215 #: kallithea/tests/data/templates/summary/summary.html.py:219 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 msgid "Forks" msgstr "" #: kallithea/templates/forks/forks_data.html:14 #: kallithea/tests/data/templates/forks/forks_data.html.py:49 -#: kallithea/templates/forks/forks_data.html:17 msgid "Forked" msgstr "" #: kallithea/templates/forks/forks_data.html:24 #: kallithea/tests/data/templates/forks/forks_data.html.py:66 -#: kallithea/templates/forks/forks_data.html:30 msgid "There are no forks yet" msgstr "" #: kallithea/templates/journal/journal.html:22 #: kallithea/tests/data/templates/journal/journal.html.py:156 -#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" #: kallithea/templates/journal/journal.html:23 #: kallithea/tests/data/templates/journal/journal.html.py:160 -#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" #: kallithea/templates/journal/journal.html:34 #: kallithea/tests/data/templates/journal/journal.html.py:200 -#: kallithea/templates/journal/journal.html:56 msgid "My Repositories" msgstr "" #: kallithea/templates/journal/journal_data.html:42 #: kallithea/tests/data/templates/journal/journal_data.html.py:82 -#: kallithea/templates/journal/journal_data.html:43 msgid "No entries yet" msgstr "" @@ -7179,14 +5850,11 @@ #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 -#: kallithea/templates/pullrequests/pullrequest.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Title" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:28 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 -#: kallithea/templates/pullrequests/pullrequest.html:34 msgid "Summarize the changes - or leave empty" msgstr "" @@ -7194,26 +5862,21 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:60 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:40 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 -#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:46 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 -#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "" #: kallithea/templates/pullrequests/pullrequest.html:62 #: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 -#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "" @@ -7251,7 +5914,6 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:72 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 msgid "Closed" msgstr "" @@ -7282,13 +5944,11 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:53 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 -#: kallithea/templates/pullrequests/pullrequest_show.html:57 msgid "Summarize the changes" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:66 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 -#: kallithea/templates/pullrequests/pullrequest_show.html:74 msgid "Reviewer voting result" msgstr "" @@ -7296,20 +5956,16 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:70 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:80 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 -#: kallithea/templates/pullrequests/pullrequest_show.html:93 msgid "Still not reviewed by" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:83 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 -#: kallithea/templates/pullrequests/pullrequest_show.html:97 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -7318,45 +5974,36 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:85 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 -#: kallithea/templates/pullrequests/pullrequest_show.html:99 msgid "Pull request was reviewed by all reviewers" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:87 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 -#: kallithea/templates/pullrequests/pullrequest_show.html:101 msgid "There are no reviewers" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:92 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 -#: kallithea/templates/pullrequests/pullrequest_show.html:107 msgid "Origin" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:97 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 -#: kallithea/templates/pullrequests/pullrequest_show.html:113 msgid "on" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:103 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 -#: kallithea/templates/pullrequests/pullrequest_show.html:120 msgid "Target" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:106 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 -#: 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." +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:114 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 -#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "" @@ -7367,20 +6014,16 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:165 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 -#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:189 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 -msgid "" -"Pull request iterations do not change content once created. Select a " -"revision and save to make a new iteration." +msgid "Pull request iterations do not change content once created. Select a revision and save to make a new iteration." msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:197 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 -#: kallithea/templates/pullrequests/pullrequest_show.html:284 msgid "Save Changes" msgstr "" @@ -7391,51 +6034,42 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:199 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 -#: kallithea/templates/pullrequests/pullrequest_show.html:286 msgid "Cancel Changes" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:207 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 -#: kallithea/templates/pullrequests/pullrequest_show.html:213 msgid "Pull Request Reviewers" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:233 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 -#: kallithea/templates/pullrequests/pullrequest_show.html:238 msgid "Remove reviewer" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:245 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 -#: kallithea/templates/pullrequests/pullrequest_show.html:250 msgid "Type name of reviewer to add" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:253 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 -#: kallithea/templates/pullrequests/pullrequest_show.html:258 msgid "Potential Reviewers" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:256 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 -#: kallithea/templates/pullrequests/pullrequest_show.html:261 msgid "Click to add the repository owner as reviewer:" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:281 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 -#: kallithea/templates/pullrequests/pullrequest_show.html:296 msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 #: kallithea/tests/data/templates/compare/compare_cs.html.py:142 #: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 msgid "Common ancestor" msgstr "" @@ -7455,36 +6089,30 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:31 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 msgid "Open New Pull Request" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:34 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format msgid "Show Pull Requests to %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:36 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_my.html:34 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "" @@ -7493,7 +6121,6 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_my.html:40 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "" @@ -7512,31 +6139,26 @@ #: kallithea/templates/search/search.html:47 #: kallithea/tests/data/templates/search/search.html.py:130 -#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "" #: kallithea/templates/search/search.html:54 #: kallithea/tests/data/templates/search/search.html.py:138 -#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "" #: kallithea/templates/search/search.html:56 #: kallithea/tests/data/templates/search/search.html.py:140 -#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "" #: kallithea/templates/search/search.html:57 #: kallithea/tests/data/templates/search/search.html.py:141 -#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "" #: kallithea/templates/search/search.html:58 #: kallithea/tests/data/templates/search/search.html.py:142 -#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "" @@ -7546,9 +6168,6 @@ #: kallithea/tests/data/templates/search/search_commit.html.py:68 #: kallithea/tests/data/templates/search/search_content.html.py:53 #: kallithea/tests/data/templates/search/search_path.html.py:47 -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" @@ -7562,7 +6181,6 @@ #: kallithea/templates/summary/summary.html:35 #: kallithea/tests/data/templates/summary/statistics.html.py:197 #: kallithea/tests/data/templates/summary/summary.html.py:323 -#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "" @@ -7571,7 +6189,6 @@ #: kallithea/templates/summary/summary.html:36 #: kallithea/tests/data/templates/summary/statistics.html.py:201 #: kallithea/tests/data/templates/summary/summary.html.py:327 -#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "" @@ -7582,15 +6199,11 @@ #: kallithea/tests/data/templates/summary/statistics.html.py:131 #: kallithea/tests/data/templates/summary/summary.html.py:165 #: kallithea/tests/data/templates/summary/summary.html.py:182 -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 msgid "Enable" msgstr "" #: kallithea/templates/summary/statistics.html:35 #: kallithea/tests/data/templates/summary/statistics.html.py:135 -#: kallithea/templates/summary/statistics.html:39 msgid "Stats gathered: " msgstr "" @@ -7598,8 +6211,6 @@ #: kallithea/templates/summary/summary.html:323 #: kallithea/tests/data/templates/summary/statistics.html.py:142 #: kallithea/tests/data/templates/summary/summary.html.py:289 -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 msgid "files" msgstr "" @@ -7607,56 +6218,46 @@ #: kallithea/templates/summary/summary.html:349 #: kallithea/tests/data/templates/summary/statistics.html.py:144 #: kallithea/tests/data/templates/summary/summary.html.py:291 -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 msgid "Show more" msgstr "" #: kallithea/templates/summary/statistics.html:388 #: kallithea/tests/data/templates/summary/statistics.html.py:147 -#: kallithea/templates/summary/statistics.html:390 msgid "commits" msgstr "" #: kallithea/templates/summary/statistics.html:389 #: kallithea/tests/data/templates/summary/statistics.html.py:149 -#: kallithea/templates/summary/statistics.html:391 msgid "files added" msgstr "" #: kallithea/templates/summary/statistics.html:390 #: kallithea/tests/data/templates/summary/statistics.html.py:151 -#: kallithea/templates/summary/statistics.html:392 msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 #: kallithea/tests/data/templates/summary/statistics.html.py:153 -#: kallithea/templates/summary/statistics.html:393 msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 #: kallithea/tests/data/templates/summary/statistics.html.py:155 -#: kallithea/templates/summary/statistics.html:395 msgid "commit" msgstr "" #: kallithea/templates/summary/statistics.html:394 #: kallithea/tests/data/templates/summary/statistics.html.py:157 -#: kallithea/templates/summary/statistics.html:396 msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 #: kallithea/tests/data/templates/summary/statistics.html.py:159 -#: kallithea/templates/summary/statistics.html:397 msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 #: kallithea/tests/data/templates/summary/statistics.html.py:161 -#: kallithea/templates/summary/statistics.html:398 msgid "file removed" msgstr "" @@ -7679,67 +6280,56 @@ #: kallithea/templates/summary/summary.html:21 #: kallithea/tests/data/templates/summary/summary.html.py:371 -#: kallithea/templates/summary/summary.html:22 msgid "Fork of" msgstr "" #: kallithea/templates/summary/summary.html:26 #: kallithea/tests/data/templates/summary/summary.html.py:380 -#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "" #: kallithea/templates/summary/summary.html:67 #: kallithea/tests/data/templates/summary/summary.html.py:145 -#: kallithea/templates/summary/summary.html:79 msgid "Show by ID" msgstr "" #: kallithea/templates/summary/summary.html:72 #: kallithea/tests/data/templates/summary/summary.html.py:143 -#: kallithea/templates/summary/summary.html:78 msgid "Show by Name" msgstr "" #: kallithea/templates/summary/summary.html:83 #: kallithea/tests/data/templates/summary/summary.html.py:153 -#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" #: kallithea/templates/summary/summary.html:97 #: kallithea/tests/data/templates/summary/summary.html.py:168 -#: kallithea/templates/summary/summary.html:108 msgid "Download" msgstr "" #: kallithea/templates/summary/summary.html:100 #: kallithea/tests/data/templates/summary/summary.html.py:174 -#: kallithea/templates/summary/summary.html:112 msgid "There are no downloads yet" msgstr "" #: kallithea/templates/summary/summary.html:102 #: kallithea/tests/data/templates/summary/summary.html.py:178 -#: kallithea/templates/summary/summary.html:114 msgid "Downloads are disabled for this repository" msgstr "" #: kallithea/templates/summary/summary.html:108 #: kallithea/tests/data/templates/summary/summary.html.py:190 -#: kallithea/templates/summary/summary.html:120 msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 #: kallithea/tests/data/templates/summary/summary.html.py:194 -#: kallithea/templates/summary/summary.html:125 msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 #: kallithea/tests/data/templates/summary/summary.html.py:196 -#: kallithea/templates/summary/summary.html:125 msgid "With subrepos" msgstr "" @@ -7747,866 +6337,244 @@ #: kallithea/templates/summary/summary.html:154 #: kallithea/tests/data/templates/summary/summary.html.py:234 #: kallithea/tests/data/templates/summary/summary.html.py:240 -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 msgid "Feed" msgstr "" #: kallithea/templates/summary/summary.html:174 #: kallithea/tests/data/templates/summary/summary.html.py:254 -#: kallithea/templates/summary/summary.html:186 msgid "Latest Changes" msgstr "" #: kallithea/templates/summary/summary.html:176 #: kallithea/tests/data/templates/summary/summary.html.py:258 -#: kallithea/templates/summary/summary.html:188 msgid "Quick Start" msgstr "" #: kallithea/templates/summary/summary.html:191 #: kallithea/tests/data/templates/summary/summary.html.py:265 -#: kallithea/templates/summary/summary.html:202 #, python-format msgid "Readme file from revision %s:%s" msgstr "" #: kallithea/templates/summary/summary.html:267 #: kallithea/tests/data/templates/summary/summary.html.py:276 -#: kallithea/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "" #: kallithea/tests/data/templates/index.html.py:117 -#: kallithea/templates/index.html:5 msgid "Dashboard" msgstr "" #: kallithea/tests/data/templates/index_base.html.py:98 -#: kallithea/templates/index_base.html:45 msgid "Group Name" msgstr "" #: kallithea/tests/data/templates/login.html.py:77 -#: kallithea/templates/login.html:44 msgid "Remember me" msgstr "" #: kallithea/tests/data/templates/admin/gists/new.html.py:209 -#: kallithea/templates/admin/gists/new.html:47 msgid "name this file..." msgstr "" #: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 -#: kallithea/templates/admin/my_account/my_account_profile.html:11 msgid "Change your avatar at" msgstr "" #: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 -#: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 msgid "Using" msgstr "" #: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 -#: kallithea/templates/admin/my_account/my_account_profile.html:15 msgid "Missing email, please update your user email address." msgstr "" #: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 -#: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format msgid "%s Repository group dashboard" msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 -#: kallithea/templates/admin/settings/settings_mapping.html:6 msgid "Rescan option" msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 -#: kallithea/templates/admin/settings/settings_vcs.html:6 msgid "Web" msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 -#: kallithea/templates/admin/settings/settings_vcs.html:11 msgid "Require SSL for vcs operations" msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." +msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 -#: kallithea/templates/admin/settings/settings_visual.html:24 msgid "Use Gravatars in Kallithea" msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following " -"variables are available:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " -"location/server host of running Kallithea server,\n" -" {repo} full " -"repository name,\n" -" {repoid} ID of " -"repository, can be used to construct clone-by-id" +" The following variables are available:\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {user} current user username,\n" +" {netloc} network location/server host of running Kallithea server,\n" +" {repo} full repository name,\n" +" {repoid} ID of repository, can be used to construct clone-by-id" msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 -#: kallithea/templates/admin/settings/settings_visual.html:55 msgid "Dashboard items" msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 -#: kallithea/templates/admin/settings/settings_visual.html:59 -msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +msgid "Number of items displayed in the main page dashboard before pagination is shown." msgstr "" #: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 -#: kallithea/templates/admin/settings/settings_visual.html:65 msgid "Admin pages items" msgstr "" #: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 #: kallithea/tests/data/templates/journal/journal.html.py:118 -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 msgid "quick filter..." msgstr "" #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 -#: kallithea/templates/admin/users/user_edit_profile.html:8 msgid "Change avatar at" msgstr "" #: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 -#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Missing email, please update this user email address." msgstr "" #: kallithea/tests/data/templates/base/base.html.py:96 -#: kallithea/templates/base/base.html:524 msgid "Keyboard shortcuts" msgstr "" #: kallithea/tests/data/templates/base/base.html.py:98 -#: kallithea/templates/base/base.html:533 msgid "Site-wide shortcuts" msgstr "" #: kallithea/tests/data/templates/base/base.html.py:619 -#: kallithea/templates/base/base.html:319 msgid "Forgot password ?" msgstr "" #: kallithea/tests/data/templates/compare/compare_cs.html.py:54 -#: kallithea/templates/compare/compare_cs.html:8 msgid "Ancestor" msgstr "" #: kallithea/tests/data/templates/compare/compare_cs.html.py:150 -#: kallithea/templates/compare/compare_cs.html:90 msgid "No common ancestor found - repositories are unrelated" msgstr "" #: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 #: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 -#: kallithea/templates/email_templates/changeset_comment.html:5 #, python-format msgid "Comment from %s on %s changeset %s mentioned you" msgstr "" #: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 #: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 -#: kallithea/templates/email_templates/changeset_comment.html:7 #, python-format msgid "Comment from %s on %s changeset %s" msgstr "" #: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 #: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 -#: kallithea/templates/email_templates/changeset_comment.html:12 msgid "The changeset status was changed to" msgstr "" #: kallithea/tests/data/templates/email_templates/main.html.py:31 #: kallithea/tests/data/templates/email_templates/main.txt.py:31 -#: kallithea/templates/email_templates/main.html:6 msgid "This is an automatic notification. Don't reply to this mail." msgstr "" #: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 #: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 -#: kallithea/templates/email_templates/pull_request.html:5 #, python-format msgid "%s mentioned you on %s pull request \"%s\"" msgstr "" #: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 #: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 -#: kallithea/templates/email_templates/pull_request.html:7 #, python-format msgid "%s requested your review of %s pull request \"%s\"" msgstr "" #: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 #: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 -#: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format msgid "Comment from %s on %s pull request \"%s\"" msgstr "" #: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 #: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 -#: kallithea/templates/email_templates/pull_request_comment.html:9 msgid "The comment closed the pull request with status" msgstr "" #: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 #: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 -#: kallithea/templates/email_templates/pull_request_comment.html:11 msgid "The comment was made with status" msgstr "" #: kallithea/tests/data/templates/email_templates/registration.html.py:47 #: kallithea/tests/data/templates/email_templates/registration.txt.py:47 -#: kallithea/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" #: kallithea/tests/data/templates/files/files_source.html.py:80 -#: kallithea/templates/files/files_source.html:38 #, python-format msgid "Edit on Branch:%s" msgstr "" #: kallithea/tests/data/templates/summary/summary.html.py:227 -#: kallithea/templates/summary/summary.html:156 msgid "Repository Size" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" -"Endring av status for et endringssett tilknyttet en lukket " -"innhentingsforespørsel tillates ikke" - -#: kallithea/controllers/login.py:152 +#~ msgid "Changing status on a changeset associated with a closed pull request is not allowed" +#~ msgstr "Endring av status for et endringssett tilknyttet en lukket innhentingsforespørsel tillates ikke" + #, fuzzy -msgid "You have successfully registered into Kallithea" -msgstr "Du har registrert deg på Kallithea" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "Manglende endringssett siden forrige innsendingsforespørsel:" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Nye endringssett på %s %s siden forrige innsendingsforespørsel:" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "Opphav endret seg ikke - vis diff siden forrige versjon:" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" -"Denne innsendingsforespørselen er basert på en annen %s-revisjon, og det " -"finnes ingen enkel diff." - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Ingen endringer funnet på %s %s siden forrige versjon." - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Lukket, erstattet av %s." - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "Innsendingsforespørsel opprettet" - -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" -"Denne innsendingsforespørselen kan ikke oppdateres med endringer på %s:" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" -"Ingen endringssett funnet for oppdatering av denne innsendingsforespørselen." - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "Git-innsendingsforespørsler støtter ikke oppdateringer enda." - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "Lukker." - -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "Feil inntraff under opprettelse av felt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: 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:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)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/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 -msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:42 -msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following " -"variables are available:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " -"location/server host of running Kallithea server,\n" -" {repo} full " -"repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "" - -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - -#: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" +#~ msgid "You have successfully registered into Kallithea" +#~ msgstr "Du har registrert deg på Kallithea" + +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "Manglende endringssett siden forrige innsendingsforespørsel:" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "Nye endringssett på %s %s siden forrige innsendingsforespørsel:" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "Opphav endret seg ikke - vis diff siden forrige versjon:" + +#~ msgid "This pull request is based on another %s revision and there is no simple diff." +#~ msgstr "Denne innsendingsforespørselen er basert på en annen %s-revisjon, og det finnes ingen enkel diff." + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "Ingen endringer funnet på %s %s siden forrige versjon." + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Lukket, erstattet av %s." + +#~ msgid "Pull request update created" +#~ msgstr "Innsendingsforespørsel opprettet" + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "Denne innsendingsforespørselen kan ikke oppdateres med endringer på %s:" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "Ingen endringssett funnet for oppdatering av denne innsendingsforespørselen." + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "Git-innsendingsforespørsler støtter ikke oppdateringer enda." + +#~ msgid "Closing." +#~ msgstr "Lukker." + +#~ msgid "An error occurred during creation of field" +#~ msgstr "Feil inntraff under opprettelse av felt"
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Wed Jan 30 11:12:23 2019 +0100 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Wed Jan 30 11:14:21 2019 +0100 @@ -7,449 +7,486 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.2\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2018-03-31 21:42+0000\n" "Last-Translator: Максим Якимчук <xpinovo@gmail.com>\n" -"Language-Team: Ukrainian <https://hosted.weblate.org/projects/kallithea/" -"stable/uk/>\n" +"Language-Team: Ukrainian <https://hosted.weblate.org/projects/kallithea/stable/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.20-dev\n" #: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/changelog.py:164 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Нічого" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Відображати пробіли" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ігнорувати пробіли" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "Changing status on a changeset associated with a closed pull request is not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Невідома помилка" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: 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:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:517 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:528 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "" -#: 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 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "" -#: 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 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: 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:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:126 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:148 +#, python-format +msgid "You have successfully registered with %s" +msgstr "" + +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:124 -#, python-format -msgid "%s (closed)" -msgstr "" - -#: kallithea/controllers/pullrequests.py:152 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Special" -msgstr "" - -#: kallithea/controllers/pullrequests.py:174 -msgid "Peer branches" -msgstr "" - -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "" - -#: kallithea/controllers/pullrequests.py:310 -#, python-format -msgid "Error creating pull request: %s" -msgstr "" - -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "Без опису" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 +#: kallithea/controllers/pullrequests.py:73 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:135 +#, python-format +msgid "%s (closed)" +msgstr "" + +#: kallithea/controllers/pullrequests.py:162 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:183 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:184 +msgid "Peer branches" +msgstr "" + +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +msgid "Bookmarks" +msgstr "" + +#: kallithea/controllers/pullrequests.py:326 +#, python-format +msgid "Error creating pull request: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "This pull request is based on another %s revision and there is no simple diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:381 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:410 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Без опису" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:676 +#, python-format +msgid "Successfully deleted pull request %s" +msgstr "" + +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "" @@ -461,149 +498,153 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "5 minutes" +msgstr "5 хвилин" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 хвилин" +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 +msgid "1 hour" +msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "" +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 +msgid "1 day" +msgstr "1 день" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "1 день" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 місяць" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -611,622 +652,641 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: 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/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: 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:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: 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:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:512 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" +#: kallithea/controllers/admin/repos.py:480 +msgid "An error occurred during this operation" +msgstr "" + +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 +msgid "Repository has been locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 +msgid "Repository has been unlocked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:502 #: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" +msgid "An error occurred during unlocking" +msgstr "" + +#: kallithea/controllers/admin/repos.py:533 +msgid "Cache invalidation successful" msgstr "" #: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 -msgid "Repository has been locked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 -msgid "Repository has been unlocked" -msgstr "" - -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 -msgid "An error occurred during unlocking" -msgstr "" - -#: kallithea/controllers/admin/repos.py:582 -msgid "Cache invalidation successful" -msgstr "" - -#: kallithea/controllers/admin/repos.py:586 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 +msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + #: kallithea/controllers/admin/settings.py:174 -msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:757 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:864 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:617 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:613 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1230 #, 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 "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1234,7 +1294,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1242,7 +1302,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1250,7 +1310,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1258,7 +1318,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1266,7 +1326,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1274,1241 +1334,883 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: 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:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: 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:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: 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:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: 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:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: 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:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -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: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:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:254 +#, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -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:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -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:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:288 +#, python-format +msgid "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on %(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" 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:322 +#: kallithea/model/notification.py:293 +#, python-format +msgid "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:307 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "Cannot create pull request - criss cross merge detected, please merge a later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "This iteration is based on another %s revision and there is no simple diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, 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 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:77 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:134 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" +#: kallithea/model/validators.py:310 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:326 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: kallithea/model/validators.py:329 +#, python-format +msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" +msgstr "" + #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 -#, python-format -msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "" - -#: kallithea/model/validators.py:350 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:450 msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" +#: kallithea/model/validators.py:749 +msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:761 +msgid "Please enter a valid IPv4 or IPv6 address" +msgstr "" + #: kallithea/model/validators.py:762 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" -msgstr "" - -#: kallithea/model/validators.py:774 -msgid "Please enter a valid IPv4 or IPv6 address" -msgstr "" - -#: kallithea/model/validators.py:775 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +msgid "Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: 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 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: 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:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: 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:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: 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:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: 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: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 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: 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:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "A password reset link will be sent to the specified email address if it is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 -#, python-format -msgid "You are about to set a new password for the email address %s." -msgstr "" - #: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 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 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2517,144 +2219,172 @@ msgstr[2] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "Private repositories are only visible to people explicitly added as collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "Private repositories are only visible to people explicitly added as collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2663,43 +2393,61 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html: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 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" @@ -2708,271 +2456,404 @@ msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -2980,263 +2861,343 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "" -#: 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:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 +msgid "Apply to all existing repositories" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:26 -msgid "Apply to all existing repositories" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 +msgid "Repository group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 +msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 +msgid "Permissions for the Default user on new repository groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:39 -msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:40 -msgid "Apply to all existing repository groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 -msgid "Permissions for the Default user on new repository groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: 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." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 +msgid "Repository creation with group write access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 +msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 +msgid "User group creation" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 +msgid "Enable this to allow non-admins to create user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:74 -msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:79 -msgid "User group creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:83 -msgid "Enable this to allow non-admins to create user groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3245,31 +3206,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: 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:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3293,12 +3265,14 @@ #: 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:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3310,16 +3284,32 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3327,95 +3317,106 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "Default revision for files page, downloads, full text search index and readme generation" msgstr "" @@ -3438,103 +3439,128 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "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 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3542,15 +3568,18 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." msgstr "" @@ -3558,134 +3587,138 @@ msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the repository URL changes.\n" " Using the above permanent URL guarantees that this repository always will be accessible on that URL.\n" " This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "Optional: URL of a remote repository. If set, the repository can be pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3698,289 +3731,346 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 -msgid "HTML with JavaScript for web analytics systems like Google Analytics or Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 +msgid "HTML (possibly with JavaScript and/or CSS) that will be added to the bottom of every page. This can be used for web analytics systems like Google Analytics or Piwik, but also to perform instance-specific customizations like adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 +msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 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 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 +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:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:10 -msgid "Upgrade info endpoint" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 +msgid "Location of repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following variables of the URL will be replaced accordingly.\n" @@ -3991,88 +4081,110 @@ " {netloc} network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following variables are available:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 -msgid "Number of items displayed in the main page dashboard before pagination is shown." +" The following variables are available:\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {user} current user username,\n" +" {netloc} network location/server host of running Kallithea server,\n" +" {repo} full repository name,\n" +" {repoid} ID of repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "Number of items displayed in the repository pages before pagination is shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "Number of items displayed in the admin pages grids before pagination is shown." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 +msgid "Icons" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:75 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 +msgid "Parses meta tags from the repository description field and turns them into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:111 -msgid "Parses meta tags from the repository description field and turns them into colored tags." -msgstr "" - #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4082,13 +4194,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4097,48 +4211,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4148,12 +4273,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4162,7 +4289,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4171,395 +4299,448 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 +msgid "Options" +msgstr "" + #: kallithea/templates/base/base.html:147 -msgid "Options" +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 +msgid "Search" msgstr "" #: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare Fork" +#: kallithea/tests/data/templates/base/base.html.py:399 +msgid "Unlock" msgstr "" #: 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 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "" - -#: 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:163 -msgid "Unlock" +#: kallithea/tests/data/templates/base/base.html.py:405 +msgid "Lock" msgstr "" #: kallithea/templates/base/base.html:165 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:173 +#: kallithea/tests/data/templates/base/base.html.py:413 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 msgid "Unfollow" msgstr "" -#: 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 +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:170 +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:311 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 -msgid "Search in repositories" -msgstr "" - -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 -msgid "My Pull Requests" -msgstr "" - -#: kallithea/templates/base/base.html:289 -msgid "Not Logged In" -msgstr "" - -#: kallithea/templates/base/base.html:296 -msgid "Login to Your Account" -msgstr "" - #: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/tests/data/templates/base/base.html.py:540 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:407 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - -#: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "Select to inherit global settings, IP whitelist and permissions from the %s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" +#: kallithea/tests/data/templates/base/root.html.py:85 +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +#: kallithea/tests/data/templates/base/root.html.py:103 +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4567,201 +4748,284 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" -"Changeset status: %s\n" +"Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:81 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:98 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4769,9 +5033,12 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4779,84 +5046,113 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 +msgid "No title" +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:22 -msgid "No title" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 msgid "on this changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 msgid "Status change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 +msgid "Commenting on line." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 +msgid "Comments are in plain text. Use @username inside this text to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 +msgid "Finish pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -4864,7 +5160,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" @@ -4872,7 +5169,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -4880,125 +5178,159 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "" - #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown error" +msgid "Unknown operation: %r" +msgstr "Невідома помилка" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "Please merge the target branch to your branch before creating a pull request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:76 -msgid "Show merge diff" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - #: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5006,103 +5338,163 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +msgid "Changeset on" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Latest Changes" +msgid "Status change:" +msgstr "Останні зміни" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 +msgid "This account is however managed outside this system and the password cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 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 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 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 -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +msgid "Pull request from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5121,82 +5513,104 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "" - -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/files/files_add.html.py:241 +msgid "New file type" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5206,7 +5620,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5219,25 +5633,24 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -5245,76 +5658,104 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +#: kallithea/tests/data/templates/files/files_source.html.py:133 +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5323,70 +5764,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5400,34 +5851,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5462,7 +5924,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5480,33 +5944,41 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5514,76 +5986,105 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 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 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 +msgid "Pull request iterations do not change content once created. Select a revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5601,237 +6102,450 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: 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_all.html:46 #: 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.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "файли" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "Показати більше" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "Клонувати з" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "Останні зміни" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "Швидкий старт" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" +" The following variables are available:\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {user} current user username,\n" +" {netloc} network location/server host of running Kallithea server,\n" +" {repo} full repository name,\n" +" {repoid} ID of repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "Number of items displayed in the main page dashboard before pagination is shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr ""