Mercurial > kallithea
diff kallithea/i18n/de/LC_MESSAGES/kallithea.po @ 7867:4e54b61f52e9 default-i18n
i18n: regenerate translation data (commit de1342abcf42)
Regenerate translation data based on new development on the default branch,
including removal of the repository locking feature, and addition of SSH
repository access.
This commit was created via:
scripts/i18n-update export <repo> -r de1342abcf42
| author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
|---|---|
| date | Mon, 02 Sep 2019 21:43:37 +0200 |
| parents | 2d8796af8cc8 |
| children | a62acba8124e |
line wrap: on
line diff
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Sep 02 21:04:54 2019 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Sep 02 21:43:37 2019 +0200 @@ -1,11 +1,10 @@ # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. - msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"POT-Creation-Date: 2019-09-02 21:36+0200\n" "PO-Revision-Date: 2019-05-29 22:52+0000\n" "Last-Translator: ssantos <ssantos@web.de>\n" "Language-Team: German <https://hosted.weblate.org/projects/kallithea/" @@ -18,14 +17,14 @@ "X-Generator: Weblate 3.7-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +#: kallithea/controllers/pullrequests.py:250 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Es gibt noch keine Änderungssätze" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/controllers/changelog.py:136 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/changelog.py:137 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 @@ -34,48 +33,48 @@ msgid "None" msgstr "Keine" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:140 kallithea/controllers/files.py:189 msgid "(closed)" msgstr "(geschlossen)" -#: kallithea/controllers/changeset.py:83 +#: kallithea/controllers/changeset.py:81 msgid "Show whitespace" msgstr "Zeige unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:90 -#: kallithea/controllers/changeset.py:97 +#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:95 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignoriere unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:163 +#: kallithea/controllers/changeset.py:161 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Erhöhe diff-Kontext auf %(num)s Zeilen" -#: kallithea/controllers/changeset.py:203 +#: kallithea/controllers/changeset.py:201 #, fuzzy #| msgid "No permission to change pull request status" msgid "No permission to change status" msgstr "Keine Berechtigung zum Ändern des Status des Pull Requests" -#: kallithea/controllers/changeset.py:214 +#: kallithea/controllers/changeset.py:212 #, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-Request %s erfolgreich gelöscht" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:319 kallithea/controllers/files.py:89 +#: kallithea/controllers/files.py:109 kallithea/controllers/files.py:700 msgid "Such revision does not exist for this repository" msgstr "Die angegebene Version existiert nicht in diesem Repository" -#: kallithea/controllers/compare.py:66 +#: kallithea/controllers/compare.py:68 #, fuzzy, python-format #| msgid "Go to tip of repository" msgid "Could not find other repository %s" msgstr "Gehe zum Tip des Repositorys" -#: kallithea/controllers/compare.py:72 +#: kallithea/controllers/compare.py:74 #, fuzzy #| msgid "Cannot compare repositories without using common ancestor" msgid "Cannot compare repositories of different types" @@ -83,52 +82,52 @@ "Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht " "möglich" -#: kallithea/controllers/compare.py:244 +#: kallithea/controllers/compare.py:246 msgid "Cannot show empty diff" msgstr "Kann leeren diff nicht anzeigen" -#: kallithea/controllers/compare.py:246 +#: kallithea/controllers/compare.py:248 msgid "No ancestor found for merge diff" msgstr "Es konnte kein Vorfahre für den merge diff gefunden werden" -#: kallithea/controllers/compare.py:250 +#: kallithea/controllers/compare.py:252 msgid "Multiple merge ancestors found for merge compare" msgstr "Es wurden mehrere merge Vorfahren für den merge Vergleich gefunden" -#: kallithea/controllers/compare.py:266 +#: kallithea/controllers/compare.py:268 msgid "Cannot compare repositories without using common ancestor" msgstr "" "Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht " "möglich" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Keine Rückmeldung" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:85 msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" "Die Anfrage konnte wegen ungültiger Syntax vom Server nicht ausgewertet " "werden." -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:88 msgid "Unauthorized access to resource" msgstr "Unauthorisierter Zugang zur Ressource" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:90 msgid "You don't have permission to view this page" msgstr "Du hast keine Rechte, um diese Seite zu betrachten" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:92 msgid "The resource could not be found" msgstr "Die Ressource konnte nicht gefunden werden" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:94 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -136,12 +135,12 @@ "Aufgrund einer unerwarteten Gegebenheit konnte der Server diese Anfrage " "nicht vollenden." -#: kallithea/controllers/feed.py:63 +#: kallithea/controllers/feed.py:64 #, python-format msgid "%s committed on %s" msgstr "%s committed am %s" -#: kallithea/controllers/feed.py:88 +#: kallithea/controllers/feed.py:89 #: kallithea/templates/changeset/changeset.html:154 #: kallithea/templates/changeset/changeset.html:173 #: kallithea/templates/compare/compare_diff.html:81 @@ -151,125 +150,119 @@ msgid "Changeset was too big and was cut off..." msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." -#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#: kallithea/controllers/feed.py:112 kallithea/controllers/feed.py:144 #, python-format msgid "%s %s feed" msgstr "%s %s Feed" -#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#: kallithea/controllers/feed.py:114 kallithea/controllers/feed.py:146 #, python-format msgid "Changes on %s repository" msgstr "Änderungen im %s Repository" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:85 msgid "Click here to add new file" msgstr "Hier klicken, um eine neue Datei hinzuzufügen" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:86 #, fuzzy #| msgid "There are no files yet. %s" msgid "There are no files yet." msgstr "Es gibt hier noch keine Dateien. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:186 #, python-format msgid "%s at %s" msgstr "%s auf %s" -#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 -#: kallithea/controllers/files.py:426 -#, python-format -msgid "This repository has been locked by %s on %s" -msgstr "Dieses Repository ist von %s am %s gesperrt worden" - -#: kallithea/controllers/files.py:311 +#: kallithea/controllers/files.py:296 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "" "Dateien können nur gelöscht werden, deren Revision ein gültiger Branch ist" -#: kallithea/controllers/files.py:322 +#: kallithea/controllers/files.py:307 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Datei %s via Kallithea gelöscht" -#: kallithea/controllers/files.py:344 +#: kallithea/controllers/files.py:331 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:335 kallithea/controllers/files.py:394 +#: kallithea/controllers/files.py:469 msgid "Error occurred during commit" msgstr "Während des Commits trat ein Fehler auf" -#: kallithea/controllers/files.py:371 +#: kallithea/controllers/files.py:350 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "" "Dateien können nur editiert werden, deren Revision ein gültiger Branch ist" -#: kallithea/controllers/files.py:385 +#: kallithea/controllers/files.py:364 #, python-format msgid "Edited file %s via Kallithea" msgstr "Datei %s via Kallithea editiert" -#: kallithea/controllers/files.py:401 +#: kallithea/controllers/files.py:380 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 +#: kallithea/controllers/files.py:390 kallithea/controllers/files.py:458 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:437 +#: kallithea/controllers/files.py:409 msgid "Added file via Kallithea" msgstr "Datei via Kallithea hinzugefügt" -#: kallithea/controllers/files.py:458 +#: kallithea/controllers/files.py:430 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:462 +#: kallithea/controllers/files.py:434 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:487 +#: kallithea/controllers/files.py:461 msgid "Location must be relative path and must not contain .. in path" msgstr "Der Ort muss ein relativer Pfad sein und darf nicht .. enthalten" -#: kallithea/controllers/files.py:519 +#: kallithea/controllers/files.py:493 msgid "Downloads disabled" msgstr "Downloads gesperrt" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:504 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:506 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:534 +#: kallithea/controllers/files.py:508 msgid "Unknown archive type" msgstr "Unbekannter Archivtyp" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:729 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:756 -#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#: kallithea/controllers/files.py:730 +#: kallithea/controllers/pullrequests.py:182 kallithea/model/scm.py:676 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:757 -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +#: kallithea/controllers/files.py:731 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:687 msgid "Tags" msgstr "Tags" @@ -278,11 +271,11 @@ msgid "An error occurred during repository forking %s" msgstr "Während des Forkens des Repositorys trat ein Fehler auf: %s" -#: kallithea/controllers/home.py:78 +#: kallithea/controllers/home.py:79 msgid "Groups" msgstr "Gruppen" -#: kallithea/controllers/home.py:88 +#: kallithea/controllers/home.py:89 #: 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 @@ -290,188 +283,188 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:56 #: kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:121 +#: kallithea/controllers/home.py:122 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Zweig" -#: kallithea/controllers/home.py:127 +#: kallithea/controllers/home.py:128 msgid "Closed Branches" msgstr "Geschlossene Branches" -#: kallithea/controllers/home.py:133 +#: kallithea/controllers/home.py:134 msgid "Tag" msgstr "Marke" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:140 msgid "Bookmark" msgstr "Lesezeichen" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:112 kallithea/controllers/journal.py:154 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Öffentliches Logbuch" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:297 +#: kallithea/controllers/journal.py:116 kallithea/controllers/journal.py:158 +#: kallithea/templates/base/base.html:290 #: kallithea/templates/journal/journal.html:5 #: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Logbuch" -#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +#: kallithea/controllers/login.py:140 kallithea/controllers/login.py:185 msgid "Bad captcha" msgstr "Falsches Captcha" -#: kallithea/controllers/login.py:145 +#: kallithea/controllers/login.py:146 #, python-format msgid "You have successfully registered with %s" msgstr "Sie haben sich erfolgreich bei %s registriert" -#: kallithea/controllers/login.py:189 +#: kallithea/controllers/login.py:190 msgid "A password reset confirmation code has been sent" msgstr "Ihr Link um das Passwort zurückzusetzen wurde versendet" -#: kallithea/controllers/login.py:238 +#: kallithea/controllers/login.py:239 msgid "Invalid password reset token" msgstr "Ungültiges Token zum Zurücksetzen des Passworts." -#: kallithea/controllers/admin/my_account.py:155 -#: kallithea/controllers/login.py:243 +#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:244 msgid "Successfully updated password" msgstr "Erfolgreich Kennwort geändert" -#: kallithea/controllers/pullrequests.py:71 +#: kallithea/controllers/pullrequests.py:68 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Ungültigen Begutachter \"%s\" angegeben" -#: kallithea/controllers/pullrequests.py:133 +#: kallithea/controllers/pullrequests.py:131 #, python-format msgid "%s (closed)" msgstr "%s (geschlossen)" -#: kallithea/controllers/pullrequests.py:160 +#: kallithea/controllers/pullrequests.py:158 #: kallithea/templates/changeset/changeset.html:12 msgid "Changeset" msgstr "Änderungssatz" -#: kallithea/controllers/pullrequests.py:181 +#: kallithea/controllers/pullrequests.py:179 msgid "Special" msgstr "Spezial" -#: kallithea/controllers/pullrequests.py:182 +#: kallithea/controllers/pullrequests.py:180 msgid "Peer branches" msgstr "Branches anderer" -#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +#: kallithea/controllers/pullrequests.py:181 kallithea/model/scm.py:682 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:320 +#: kallithea/controllers/pullrequests.py:318 #, python-format msgid "Error creating pull request: %s" msgstr "Fehler beim Erstellen des Pull-Requests: %s" -#: kallithea/controllers/pullrequests.py:347 -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:345 +#: kallithea/controllers/pullrequests.py:368 msgid "Error occurred while creating pull request" msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf" -#: kallithea/controllers/pullrequests.py:352 +#: kallithea/controllers/pullrequests.py:350 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: kallithea/controllers/pullrequests.py:375 +#: kallithea/controllers/pullrequests.py:373 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Pull Request Update erstellt" -#: kallithea/controllers/pullrequests.py:403 +#: kallithea/controllers/pullrequests.py:401 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "Es wurden inzwischen folgende Begutachter hinzugefügt: %s" -#: kallithea/controllers/pullrequests.py:407 +#: kallithea/controllers/pullrequests.py:405 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "Es wurden inzwischen folgende Begutachter entfernt: %s" -#: kallithea/controllers/pullrequests.py:423 -#: kallithea/model/pull_request.py:234 +#: kallithea/controllers/pullrequests.py:421 +#: kallithea/model/pull_request.py:232 msgid "No description" msgstr "Keine Beschreibung" -#: kallithea/controllers/pullrequests.py:432 +#: kallithea/controllers/pullrequests.py:430 msgid "Pull request updated" msgstr "Pull Request aktualisiert" -#: kallithea/controllers/pullrequests.py:445 +#: kallithea/controllers/pullrequests.py:443 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:481 +#: kallithea/controllers/pullrequests.py:479 #, python-format msgid "Revision %s not found in %s" msgstr "Die Revision %s konnte in %s nicht gefunden werden" -#: kallithea/controllers/pullrequests.py:508 +#: kallithea/controllers/pullrequests.py:506 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "Error: changesets not found when displaying pull request from %s." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:522 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Dieser Pull Request wurde bereits in %s integriert." -#: kallithea/controllers/pullrequests.py:524 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" "Dieser Pull Request wurde geschlossen und kann daher nicht aktualisiert " "werden." -#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:541 #, fuzzy, python-format #| msgid "The following changes are available on %s:" msgid "The following additional changes are available on %s:" msgstr "Die folgenden Änderungen sind verfügbar unter %s:" -#: kallithea/controllers/pullrequests.py:545 -#: kallithea/controllers/pullrequests.py:549 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, fuzzy #| msgid "No changesets found for updating this pull request." msgid "No additional changesets found for iterating on this pull request." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:557 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Hinweis: Branch %s hat einen anderen Head: %s." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:562 #, fuzzy #| msgid "Git pull requests don't support updates yet." msgid "Git pull requests don't support iterating yet." msgstr "Git Pull Request unterstützen bisher keine Updates." -#: kallithea/controllers/pullrequests.py:566 +#: kallithea/controllers/pullrequests.py:564 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:590 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Der diff kann nicht angezeigt werden. Die Pull Request Revisionen konnten " @@ -490,21 +483,21 @@ msgid "An error occurred during search operation." msgstr "Während der Suchoperation trat ein Fehler auf." -#: kallithea/controllers/summary.py:179 -#: kallithea/templates/summary/summary.html:395 +#: kallithea/controllers/summary.py:171 +#: kallithea/templates/summary/summary.html:412 msgid "No data ready yet" msgstr "Es stehen noch keine Daten zur Verfügung" -#: kallithea/controllers/summary.py:182 -#: kallithea/templates/summary/summary.html:89 +#: kallithea/controllers/summary.py:174 +#: kallithea/templates/summary/summary.html:97 msgid "Statistics are disabled for this repository" msgstr "Statistiken sind deaktiviert für dieses Repository" -#: kallithea/controllers/admin/auth_settings.py:135 +#: kallithea/controllers/admin/auth_settings.py:137 msgid "Auth settings updated successfully" msgstr "Anmeldeeinstellungen erfolgreich geändert" -#: kallithea/controllers/admin/auth_settings.py:146 +#: kallithea/controllers/admin/auth_settings.py:148 msgid "error occurred during update of auth settings" msgstr "Fehler bei der Änderung der Anmeldeeinstellungen aufgetreten" @@ -516,125 +509,139 @@ msgid "Error occurred during update of defaults" msgstr "Ein Fehler trat beim updaten der Standardeinstellungen auf" -#: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:232 #: kallithea/controllers/admin/users.py:248 msgid "Forever" msgstr "Immer" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:233 #: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 Minuten" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:234 #: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 Stunde" -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:235 #: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 Tag" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/gists.py:63 +#: kallithea/controllers/admin/my_account.py:236 #: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 Monat" -#: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/gists.py:67 +#: kallithea/controllers/admin/my_account.py:238 #: kallithea/controllers/admin/users.py:254 #: kallithea/templates/admin/my_account/my_account_api_keys.html:65 #: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Lebenszeit" -#: kallithea/controllers/admin/gists.py:140 +#: kallithea/controllers/admin/gists.py:142 msgid "Error occurred during gist creation" msgstr "Ein fehler trat auf bei der Erstellung des gist" -#: kallithea/controllers/admin/gists.py:156 +#: kallithea/controllers/admin/gists.py:158 #, python-format msgid "Deleted gist %s" msgstr "gist %s gelöscht" -#: kallithea/controllers/admin/gists.py:196 +#: kallithea/controllers/admin/gists.py:198 msgid "Unmodified" msgstr "Ungeändert" -#: kallithea/controllers/admin/gists.py:225 +#: kallithea/controllers/admin/gists.py:228 msgid "Successfully updated gist content" msgstr "Erfolgreich Kerninhalt aktualisiert" -#: kallithea/controllers/admin/gists.py:230 +#: kallithea/controllers/admin/gists.py:233 msgid "Successfully updated gist data" msgstr "Erfolgreich Kerndaten aktualisiert" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:236 #, python-format msgid "Error occurred during update of gist %s" msgstr "Fehler beim Aktualisieren der Kerndaten %s" -#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:211 +#: kallithea/model/user.py:232 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Sie können diesen Benutzer nicht editieren, da er von entscheidender " "Bedeutung für die ganze Applikation ist" -#: kallithea/controllers/admin/my_account.py:117 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/my_account.py:134 #: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Fehler beim Aktualisieren der Benutzer %s" -#: kallithea/controllers/admin/my_account.py:166 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Fehler bei der Änderung des Kennworts" -#: kallithea/controllers/admin/my_account.py:207 -#: kallithea/controllers/admin/users.py:369 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:367 #, python-format msgid "Added email %s to user" msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt" -#: kallithea/controllers/admin/my_account.py:213 -#: kallithea/controllers/admin/users.py:375 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:373 msgid "An error occurred during email saving" msgstr "Währen der Speicherung der EMail Addresse trat ein Fehler auf" -#: kallithea/controllers/admin/my_account.py:222 -#: kallithea/controllers/admin/users.py:385 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:383 msgid "Removed email from user" msgstr "Die EMail Addresse wurde vom Benutzer entfernt" -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:248 #: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API Key wurde erfolgreich erstellt" -#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/my_account.py:257 #: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-Schlüssel erfolgreich zurückgesetzt" -#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-Schlüssel erfolgreich gelöscht" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/my_account.py:281 +#: kallithea/controllers/admin/users.py:456 +#, fuzzy, python-format +#| msgid "API key successfully created" +msgid "SSH key %s successfully added" +msgstr "API Key wurde erfolgreich erstellt" + +#: kallithea/controllers/admin/my_account.py:293 +#: kallithea/controllers/admin/users.py:470 +#, fuzzy +#| msgid "API key successfully deleted" +msgid "SSH key successfully deleted" +msgstr "API-Schlüssel erfolgreich gelöscht" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: 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 @@ -642,9 +649,9 @@ msgid "Read" msgstr "Lesen" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:74 #: 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 @@ -652,9 +659,9 @@ msgid "Write" msgstr "Schreiben" -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:75 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -677,258 +684,243 @@ #: 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:320 +#: kallithea/templates/base/base.html:321 #: kallithea/templates/base/base.html:327 #: kallithea/templates/base/base.html:328 -#: kallithea/templates/base/base.html:334 -#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:76 -#: kallithea/controllers/admin/permissions.py:87 -#: 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/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:89 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/controllers/admin/permissions.py:103 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:50 msgid "Disabled" msgstr "Deaktiviert" -#: kallithea/controllers/admin/permissions.py:78 +#: kallithea/controllers/admin/permissions.py:80 msgid "Allowed with manual account activation" msgstr "Erlaubt mit manueller Kontoaktivierung" -#: kallithea/controllers/admin/permissions.py:80 +#: kallithea/controllers/admin/permissions.py:82 msgid "Allowed with automatic account activation" msgstr "Erlaubt mit automatischer Kontoaktivierung" -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1673 msgid "Manual activation of external account" msgstr "Manuelle Aktivierung externen Kontos" -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1674 msgid "Automatic activation of external account" msgstr "Automatische Aktivierung externen Kontos" -#: 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/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:93 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/controllers/admin/permissions.py:104 #: kallithea/templates/admin/auth/auth_settings.html:42 #: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Aktiviert" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:127 msgid "Global permissions updated successfully" msgstr "Globale Berechtigungen erfolgreich geändert" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:142 msgid "Error occurred during update of permissions" msgstr "Fehler bei der Änderung der globalen Berechtigungen" -#: kallithea/controllers/admin/repo_groups.py:174 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Fehler bei der Erstellung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:179 +#: kallithea/controllers/admin/repo_groups.py:177 #, python-format msgid "Created repository group %s" msgstr "Repositoriumsgruppe %s erstellt" -#: kallithea/controllers/admin/repo_groups.py:226 +#: kallithea/controllers/admin/repo_groups.py:224 #, python-format msgid "Updated repository group %s" msgstr "Repositoriumsgruppe %s aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:242 +#: kallithea/controllers/admin/repo_groups.py:240 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Fehler bei der Aktualisierung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:250 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:259 +#: kallithea/controllers/admin/repo_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Diese Gruppe enthält %s Untergruppen und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "Repositoriumsgruppe %s entfernt" -#: kallithea/controllers/admin/repo_groups.py:270 +#: kallithea/controllers/admin/repo_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Fehler beim Löschen der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:354 -#: kallithea/controllers/admin/repo_groups.py:384 -#: kallithea/controllers/admin/user_groups.py:299 +#: kallithea/controllers/admin/repo_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/user_groups.py:294 msgid "Cannot revoke permission for yourself as admin" msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" -#: kallithea/controllers/admin/repo_groups.py:369 +#: kallithea/controllers/admin/repo_groups.py:367 msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:401 -#: kallithea/controllers/admin/repos.py:357 -#: kallithea/controllers/admin/user_groups.py:311 +#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repos.py:358 +#: kallithea/controllers/admin/user_groups.py:306 msgid "An error occurred during revoking of permission" msgstr "Fehler beim Entzug der Berechtigungen" -#: kallithea/controllers/admin/repos.py:137 +#: kallithea/controllers/admin/repos.py:136 #, python-format msgid "Error creating repository %s" msgstr "Fehler beim Erstellen des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:195 +#: kallithea/controllers/admin/repos.py:194 #, python-format msgid "Created repository %s from %s" msgstr "Repositorium %s von %s erstellt" -#: kallithea/controllers/admin/repos.py:204 +#: kallithea/controllers/admin/repos.py:203 #, python-format msgid "Forked repository %s as %s" msgstr "Aufgespaltenes Repositorium %s zu %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:206 #, python-format msgid "Created repository %s" msgstr "Repositorium erzeugt %s" -#: kallithea/controllers/admin/repos.py:236 +#: kallithea/controllers/admin/repos.py:235 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/repos.py:256 +#: kallithea/controllers/admin/repos.py:255 #, python-format msgid "Error occurred during update of repository %s" msgstr "Fehler bei der Aktualisierung des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:274 +#: kallithea/controllers/admin/repos.py:273 #, python-format msgid "Detached %s forks" msgstr "%s Spaltung abgetrennt" -#: kallithea/controllers/admin/repos.py:277 +#: kallithea/controllers/admin/repos.py:276 #, python-format msgid "Deleted %s forks" msgstr "%s Spaltung gelöscht" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted repository %s" msgstr "Repositorium %s gelöscht" -#: kallithea/controllers/admin/repos.py:285 +#: kallithea/controllers/admin/repos.py:284 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "%s konnte nicht gelöscht werden, da es noch Forks besitzt" -#: kallithea/controllers/admin/repos.py:290 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "An error occurred during deletion of %s" msgstr "Beim Löschen von %s trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:330 +#: kallithea/controllers/admin/repos.py:329 msgid "Repository permissions updated" msgstr "Repositoriumsberechtigungen aktualisiert" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:388 #, python-format msgid "Field validation error: %s" msgstr "Feldvalidierung fehlgeschlagen: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:391 #, fuzzy, python-format #| msgid "An error occurred during creation of field" msgid "An error occurred during creation of field: %r" msgstr "Fehler während der Erzeugung des Feldes" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:402 msgid "An error occurred during removal of field" msgstr "Fehler beim Entfernen des Feldes" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:416 msgid "-- Not a fork --" msgstr "-- Keine Abspaltung --" -#: kallithea/controllers/admin/repos.py:446 +#: kallithea/controllers/admin/repos.py:448 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:452 msgid "An error occurred during setting this repository in public journal" msgstr "" "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses " "Repositorys im Öffentlichen Logbuch auf" -#: kallithea/controllers/admin/repos.py:466 +#: kallithea/controllers/admin/repos.py:468 msgid "Nothing" msgstr "Nichts" -#: kallithea/controllers/admin/repos.py:468 +#: kallithea/controllers/admin/repos.py:470 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: kallithea/controllers/admin/repos.py:475 +#: kallithea/controllers/admin/repos.py:477 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:491 -#: kallithea/controllers/admin/repos.py:512 -msgid "Repository has been locked" -msgstr "Repository wurde gesperrt" +#: kallithea/controllers/admin/repos.py:490 +msgid "Cache invalidation successful" +msgstr "Cache Entfernung war erfolgreich" #: kallithea/controllers/admin/repos.py:494 -#: kallithea/controllers/admin/repos.py:509 -msgid "Repository has been unlocked" -msgstr "Repository nicht mehr gesperrt" - -#: kallithea/controllers/admin/repos.py:497 -#: kallithea/controllers/admin/repos.py:516 -msgid "An error occurred during unlocking" -msgstr "Fehler beim Entsperren" - -#: kallithea/controllers/admin/repos.py:528 -msgid "Cache invalidation successful" -msgstr "Cache Entfernung war erfolgreich" - -#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Währen der Cache Invalidierung trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:545 +#: kallithea/controllers/admin/repos.py:507 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: kallithea/controllers/admin/repos.py:548 +#: kallithea/controllers/admin/repos.py:510 msgid "An error occurred during pull from remote location" msgstr "" "Es trat ein Fehler auf während das Repository von einem Entfernten " "Speicherort übertragen wurde" -#: kallithea/controllers/admin/repos.py:579 +#: kallithea/controllers/admin/repos.py:541 msgid "An error occurred during deletion of repository stats" msgstr "Während des löschens der Repository Statistiken trat ein Fehler auf" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:131 msgid "Updated VCS settings" msgstr "VCS-Einstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +#: kallithea/controllers/admin/settings.py:135 kallithea/lib/utils.py:235 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -936,121 +928,121 @@ "hgsubversion-Unterstützung konnte nicht aktiviert werden. Die " "\"hgsubversion\"-Bibliothek fehlt" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:237 +#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:233 msgid "Error occurred while updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " "aufgetreten" -#: kallithea/controllers/admin/settings.py:180 +#: kallithea/controllers/admin/settings.py:176 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Die Repositories wurden erfolgreich überprüft. Hinzugefügt: %s. Entfernt: " "%s." -#: kallithea/controllers/admin/settings.py:192 +#: kallithea/controllers/admin/settings.py:188 #, fuzzy, python-format #| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "Ungültiger Repositorycache" -#: kallithea/controllers/admin/settings.py:233 +#: kallithea/controllers/admin/settings.py:229 msgid "Updated application settings" msgstr "Anwendungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:286 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Visualisierungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:291 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" "Es ist ein Fehler während der Aktualisierung der Layouteinstellung " "aufgetreten" -#: kallithea/controllers/admin/settings.py:315 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Task zum Versenden von E-Mails erstellt" -#: kallithea/controllers/admin/settings.py:358 +#: kallithea/controllers/admin/settings.py:355 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Es stehen noch keine Daten zur Verfügung" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:357 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" "Die eingebauten Hooks sind schreibgeschützt. Bitte verwenden Sie einen " "anderen Hook-Namen." -#: kallithea/controllers/admin/settings.py:363 +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:379 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Während der Erzeugung des Hooks ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" -#: kallithea/controllers/admin/user_groups.py:143 +#: kallithea/controllers/admin/user_groups.py:138 #, python-format msgid "Created user group %s" msgstr "Nutzergruppe %s erstellt" -#: kallithea/controllers/admin/user_groups.py:156 +#: kallithea/controllers/admin/user_groups.py:151 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" "Es ist ein Fehler während der Erstellung der Nutzergruppe %s aufgetreten" -#: kallithea/controllers/admin/user_groups.py:184 +#: kallithea/controllers/admin/user_groups.py:179 #, python-format msgid "Updated user group %s" msgstr "Aktualisierte Nutzergruppe %s" -#: kallithea/controllers/admin/user_groups.py:206 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Error occurred during update of user group %s" msgstr "" "Während des Updates der Benutzergruppe %s ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/user_groups.py:217 +#: kallithea/controllers/admin/user_groups.py:212 msgid "Successfully deleted user group" msgstr "Die Nutzergruppe wurde erfolgreich entfernt" -#: kallithea/controllers/admin/user_groups.py:222 +#: kallithea/controllers/admin/user_groups.py:217 msgid "An error occurred during deletion of user group" msgstr "Während des Löschens der Benutzergruppe ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/user_groups.py:278 +#: kallithea/controllers/admin/user_groups.py:273 msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche Gruppe sein" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:279 msgid "User group permissions updated" msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:395 -#: kallithea/controllers/admin/users.py:340 +#: kallithea/controllers/admin/user_groups.py:388 +#: kallithea/controllers/admin/users.py:338 msgid "Updated permissions" msgstr "Berechtigungen wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:399 -#: kallithea/controllers/admin/users.py:344 +#: kallithea/controllers/admin/user_groups.py:392 +#: kallithea/controllers/admin/users.py:342 msgid "An error occurred during permissions saving" msgstr "" "Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten" @@ -1081,224 +1073,226 @@ msgid "The default user cannot be edited" msgstr "Der Standard-Benutzer kann nicht bearbeitet werden" -#: kallithea/controllers/admin/users.py:412 +#: kallithea/controllers/admin/users.py:409 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Die IP-Adresse %s wurde zur Nutzerwhitelist hinzugefügt" -#: kallithea/controllers/admin/users.py:418 +#: kallithea/controllers/admin/users.py:415 msgid "An error occurred while adding IP address" msgstr "Während des Speicherns der IP-Adresse ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:430 +#: kallithea/controllers/admin/users.py:427 msgid "Removed IP address from user whitelist" msgstr "IP-Adresse wurde von der Nutzerwhitelist entfernt" -#: kallithea/lib/auth.py:824 +#: kallithea/lib/auth.py:684 msgid "You need to be a registered user to perform this action" msgstr "" "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" -#: kallithea/lib/auth.py:852 +#: kallithea/lib/auth.py:712 msgid "You need to be signed in to view this page" msgstr "Sie müssen sich anmelden um diese Seite aufzurufen" -#: kallithea/lib/base.py:444 -msgid "Invalid API key" -msgstr "Ungültiger API Key" - -#: kallithea/lib/base.py:495 +#: kallithea/lib/base.py:483 msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" "Es wurde ein CSRF Leck entdeckt. Alle Formular Token sind abgelaufen" -#: kallithea/lib/base.py:583 +#: kallithea/lib/base.py:580 msgid "Repository not found in the filesystem" msgstr "Das Repository konnte nicht im Filesystem gefunden werden" -#: kallithea/lib/base.py:608 +#: kallithea/lib/base.py:605 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "Änderungssatz nicht gefunden" -#: kallithea/lib/diffs.py:193 +#: kallithea/lib/base.py:647 +#, fuzzy +#| msgid "Your account is disabled" +msgid "SSH access is disabled." +msgstr "Ihr Account wurde Deaktiviert" + +#: kallithea/lib/diffs.py:194 msgid "Binary file" msgstr "Binäre Datei" -#: kallithea/lib/diffs.py:213 +#: kallithea/lib/diffs.py:214 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das " "Diff Menü um die Unterschiede anzuzeigen" -#: kallithea/lib/diffs.py:223 +#: kallithea/lib/diffs.py:224 msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:641 #, python-format msgid "Deleted branch: %s" msgstr "Branch %s gelöscht" -#: kallithea/lib/helpers.py:614 +#: kallithea/lib/helpers.py:643 #, python-format msgid "Created tag: %s" msgstr "Tag %s erstellt" -#: kallithea/lib/helpers.py:625 +#: kallithea/lib/helpers.py:654 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "Änderungssatz nicht gefunden" -#: kallithea/lib/helpers.py:674 +#: kallithea/lib/helpers.py:703 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Zeige alle Kombinierten Änderungensätze %s->%s" -#: kallithea/lib/helpers.py:680 +#: kallithea/lib/helpers.py:709 msgid "Compare view" msgstr "Vergleichsansicht" -#: kallithea/lib/helpers.py:699 +#: kallithea/lib/helpers.py:728 msgid "and" msgstr "und" -#: kallithea/lib/helpers.py:700 +#: kallithea/lib/helpers.py:729 #, python-format msgid "%s more" msgstr "%s mehr" -#: kallithea/lib/helpers.py:701 +#: kallithea/lib/helpers.py:730 #: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "revisionen" -#: kallithea/lib/helpers.py:725 +#: kallithea/lib/helpers.py:754 #, python-format msgid "Fork name %s" msgstr "Fork Name %s" -#: kallithea/lib/helpers.py:746 +#: kallithea/lib/helpers.py:775 #, python-format msgid "Pull request %s" msgstr "Pull Request %s" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:785 msgid "[deleted] repository" msgstr "[gelöscht] Repository" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:787 kallithea/lib/helpers.py:799 msgid "[created] repository" msgstr "[erstellt] Repository" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:789 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:791 kallithea/lib/helpers.py:801 msgid "[forked] repository" msgstr "[forked] Repository" -#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:793 kallithea/lib/helpers.py:803 msgid "[updated] repository" msgstr "[aktualisiert] Repository" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:795 msgid "[downloaded] archive from repository" msgstr "Archiv von Repository [heruntergeladen]" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:797 msgid "[delete] repository" msgstr "Repository [gelöscht]" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:805 msgid "[created] user" msgstr "Benutzer [erstellt]" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:807 msgid "[updated] user" msgstr "Benutzer [akutalisiert]" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:809 msgid "[created] user group" msgstr "Benutzergruppe [erstellt]" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:811 msgid "[updated] user group" msgstr "Benutzergruppe [aktualisiert]" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:813 msgid "[commented] on revision in repository" msgstr "Revision [kommentiert] in Repository" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:815 msgid "[commented] on pull request for" msgstr "Pull Request [kommentiert] für" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:817 msgid "[closed] pull request for" msgstr "Pull Request [geschlossen] für" -#: kallithea/lib/helpers.py:790 +#: kallithea/lib/helpers.py:819 msgid "[pushed] into" msgstr "[Pushed] in" -#: kallithea/lib/helpers.py:792 +#: kallithea/lib/helpers.py:821 msgid "[committed via Kallithea] into repository" msgstr "[via Kallithea] in Repository [committed]" -#: kallithea/lib/helpers.py:794 +#: kallithea/lib/helpers.py:823 msgid "[pulled from remote] into repository" msgstr "[Pulled von Remote] in Repository" -#: kallithea/lib/helpers.py:796 +#: kallithea/lib/helpers.py:825 msgid "[pulled] from" msgstr "[Pulled] von" -#: kallithea/lib/helpers.py:798 +#: kallithea/lib/helpers.py:827 msgid "[started following] repository" msgstr "[Following gestartet] für Repository" -#: kallithea/lib/helpers.py:800 +#: kallithea/lib/helpers.py:829 msgid "[stopped following] repository" msgstr "[Following gestoppt] für Repository" -#: kallithea/lib/helpers.py:928 +#: kallithea/lib/helpers.py:949 #, python-format msgid " and %s more" msgstr " und %s weitere" -#: kallithea/lib/helpers.py:932 +#: kallithea/lib/helpers.py:953 #: kallithea/templates/compare/compare_diff.html:69 #: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Keine Dateien" -#: kallithea/lib/helpers.py:957 +#: kallithea/lib/helpers.py:978 msgid "new file" msgstr "neue Datei" -#: kallithea/lib/helpers.py:960 +#: kallithea/lib/helpers.py:981 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:963 +#: kallithea/lib/helpers.py:984 msgid "del" msgstr "entf" -#: kallithea/lib/helpers.py:966 +#: kallithea/lib/helpers.py:987 msgid "rename" msgstr "umbenennen" -#: kallithea/lib/helpers.py:971 +#: kallithea/lib/helpers.py:992 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1264 +#: kallithea/lib/helpers.py:1285 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1309,69 +1303,96 @@ "es im Dateisystem erstellt oder umbenannt. Bitte starten sie die " "Applikation erneut um die Repositories neu zu Indizieren" -#: kallithea/lib/utils2.py:333 +#: kallithea/lib/ssh.py:71 +msgid "SSH key is missing" +msgstr "" + +#: kallithea/lib/ssh.py:75 +msgid "Incorrect SSH key - it must have both a key type and a base64 part" +msgstr "" + +#: kallithea/lib/ssh.py:79 +msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" +msgstr "" + +#: kallithea/lib/ssh.py:82 +#, python-format +msgid "Incorrect SSH key - unexpected characters in base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:87 +#, python-format +msgid "Incorrect SSH key - failed to decode base64 part %r" +msgstr "" + +#: kallithea/lib/ssh.py:90 +#, python-format +msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" +msgstr "" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: kallithea/lib/utils2.py:334 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: kallithea/lib/utils2.py:335 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: kallithea/lib/utils2.py:336 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: kallithea/lib/utils2.py:337 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: kallithea/lib/utils2.py:338 +#: kallithea/lib/utils2.py:339 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: kallithea/lib/utils2.py:354 +#: kallithea/lib/utils2.py:355 #, python-format msgid "in %s" msgstr "in %s" -#: kallithea/lib/utils2.py:356 +#: kallithea/lib/utils2.py:357 #, python-format msgid "%s ago" msgstr "vor %s" -#: kallithea/lib/utils2.py:358 +#: kallithea/lib/utils2.py:359 #, python-format msgid "in %s and %s" msgstr "in %s und %s" -#: kallithea/lib/utils2.py:361 +#: kallithea/lib/utils2.py:362 #, python-format msgid "%s and %s ago" msgstr "%s und %s her" -#: kallithea/lib/utils2.py:364 +#: kallithea/lib/utils2.py:365 msgid "just now" msgstr "jetzt gerade" @@ -1380,140 +1401,140 @@ msgid "on line %s" msgstr "in Zeile %s" -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:114 msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1496 msgid "top level" msgstr "höchste Ebene" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1637 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1639 msgid "Default user has no access to new repositories" msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" -#: kallithea/model/db.py:1706 +#: kallithea/model/db.py:1640 msgid "Default user has read access to new repositories" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" -#: kallithea/model/db.py:1707 +#: kallithea/model/db.py:1641 msgid "Default user has write access to new repositories" msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" -#: kallithea/model/db.py:1708 +#: kallithea/model/db.py:1642 msgid "Default user has admin access to new repositories" msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" -#: kallithea/model/db.py:1710 +#: kallithea/model/db.py:1644 msgid "Default user has no access to new repository groups" msgstr "" "Der Standard-Benutzer hat keinen Zugriff auf neue Repository-Gruppen" -#: kallithea/model/db.py:1711 +#: kallithea/model/db.py:1645 msgid "Default user has read access to new repository groups" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1712 +#: kallithea/model/db.py:1646 msgid "Default user has write access to new repository groups" msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1713 +#: kallithea/model/db.py:1647 msgid "Default user has admin access to new repository groups" msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1715 +#: kallithea/model/db.py:1649 msgid "Default user has no access to new user groups" msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" -#: kallithea/model/db.py:1716 +#: kallithea/model/db.py:1650 msgid "Default user has read access to new user groups" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1717 +#: kallithea/model/db.py:1651 msgid "Default user has write access to new user groups" msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1718 +#: kallithea/model/db.py:1652 msgid "Default user has admin access to new user groups" msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1720 +#: kallithea/model/db.py:1654 msgid "Only admins can create repository groups" msgstr "Nur Admins können Repository-Gruppen erstellen" -#: kallithea/model/db.py:1721 +#: kallithea/model/db.py:1655 msgid "Non-admins can create repository groups" msgstr "Nicht-Admins können Repository-Gruppen erstellen" -#: kallithea/model/db.py:1723 +#: kallithea/model/db.py:1657 msgid "Only admins can create user groups" msgstr "Nur Admins können Benutzer-Gruppen erstellen" -#: kallithea/model/db.py:1724 +#: kallithea/model/db.py:1658 msgid "Non-admins can create user groups" msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" -#: kallithea/model/db.py:1726 +#: kallithea/model/db.py:1660 msgid "Only admins can create top level repositories" msgstr "Nur Admins können Repositories auf oberster Ebene erstellen" -#: kallithea/model/db.py:1727 +#: kallithea/model/db.py:1661 msgid "Non-admins can create top level repositories" msgstr "Nicht-Admins können Repositories oberster Ebene erstellen" -#: kallithea/model/db.py:1729 +#: kallithea/model/db.py:1663 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "aktiviert" -#: kallithea/model/db.py:1730 +#: kallithea/model/db.py:1664 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "deaktiviert" -#: kallithea/model/db.py:1732 +#: kallithea/model/db.py:1666 msgid "Only admins can fork repositories" msgstr "Nur Admins können Repositories forken" -#: kallithea/model/db.py:1733 +#: kallithea/model/db.py:1667 msgid "Non-admins can fork repositories" msgstr "Nicht-Admins können Repositorys forken" -#: kallithea/model/db.py:1735 +#: kallithea/model/db.py:1669 msgid "Registration disabled" msgstr "Registrierung deaktiviert" -#: kallithea/model/db.py:1736 +#: kallithea/model/db.py:1670 msgid "User registration with manual account activation" msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" -#: kallithea/model/db.py:1737 +#: kallithea/model/db.py:1671 msgid "User registration with automatic account activation" msgstr "Benutzerregistrierung mit automatischer Kontoaktivierung" -#: kallithea/model/db.py:2263 +#: kallithea/model/db.py:2206 msgid "Not reviewed" msgstr "Nicht Begutachtet" -#: kallithea/model/db.py:2264 +#: kallithea/model/db.py:2207 msgid "Under review" msgstr "In Begutachtung" -#: kallithea/model/db.py:2265 +#: kallithea/model/db.py:2208 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Akzeptiert" -#: kallithea/model/db.py:2266 +#: kallithea/model/db.py:2209 msgid "Approved" msgstr "Akzeptiert" @@ -1539,7 +1560,7 @@ msgid "Name must not contain only digits" msgstr "Name darf nicht nur Ziffern enthalten" -#: kallithea/model/notification.py:165 +#: kallithea/model/notification.py:164 #, fuzzy, python-format #| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgid "" @@ -1549,74 +1570,74 @@ "Kommentar für %(repo_name)s Changeset %(short_id)s in %(branch)s erstellt " "von %(comment_username)s" -#: kallithea/model/notification.py:168 +#: kallithea/model/notification.py:167 #, python-format msgid "New user %(new_username)s registered" msgstr "Neuer Benutzer %(new_username)s registriert" -#: kallithea/model/notification.py:170 +#: kallithea/model/notification.py:169 #, 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:171 +#: kallithea/model/notification.py:170 #, 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:184 +#: kallithea/model/notification.py:183 msgid "Closing" msgstr "Schließen" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:73 #, fuzzy, python-format msgid "" "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" "%(user)s möchte ein Review des Pull Request #%(pr_id)s: %(pr_title)s" -#: kallithea/model/pull_request.py:211 +#: kallithea/model/pull_request.py:209 #, fuzzy #| msgid "Error creating pull request: %s" msgid "Cannot create empty pull request" msgstr "Fehler beim Erstellen des Pull-Requests: %s" -#: kallithea/model/pull_request.py:219 +#: kallithea/model/pull_request.py:217 #, python-format msgid "" "Cannot create pull request - criss cross merge detected, please merge a " "later %s revision to %s" msgstr "" -"Pull-Request kann nicht erstellt werden - Criss Cross Merge erkannt, bitte " -"eine spätere %s-Revision in %s zusammenführen." - -#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +"Pull-Request kann nicht erstellt werden - Criss Cross Merge erkannt, " +"bitte eine spätere %s-Revision in %s zusammenführen." + +#: kallithea/model/pull_request.py:245 kallithea/model/pull_request.py:380 msgid "You are not authorized to create the pull request" msgstr "Sie sind nicht berechtigt, den Pull-Request anzulegen." -#: kallithea/model/pull_request.py:341 +#: kallithea/model/pull_request.py:339 #, fuzzy #| msgid "Missing changesets since the previous pull request:" msgid "Missing changesets since the previous iteration:" msgstr "Fehlende Changesets seit letztem Pull Request:" -#: kallithea/model/pull_request.py:348 +#: kallithea/model/pull_request.py:346 #, fuzzy, python-format #| msgid "New changesets on %s %s since the previous pull request:" msgid "New changesets on %s %s since the previous iteration:" msgstr "Neue Changesets in %s %s seit dem letzten Pull Request:" -#: kallithea/model/pull_request.py:355 +#: kallithea/model/pull_request.py:353 #, fuzzy #| msgid "Ancestor didn't change - show diff since previous version:" msgid "Ancestor didn't change - diff since previous iteration:" msgstr "Vorgänger unverändert - zeige Diff zu lezter Version:" -#: kallithea/model/pull_request.py:362 +#: kallithea/model/pull_request.py:360 #, fuzzy, python-format msgid "" "This iteration is based on another %s revision and there is no simple " @@ -1625,26 +1646,42 @@ "Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein " "Simple Diff verfügbar." -#: kallithea/model/pull_request.py:364 +#: kallithea/model/pull_request.py:362 #, fuzzy, python-format #| msgid "No changes found on %s %s since previous version." msgid "No changes found on %s %s since previous iteration." msgstr "Keine Änderungen seit der letzten Version gefunden in %s %s." -#: kallithea/model/pull_request.py:390 +#: kallithea/model/pull_request.py:388 #, python-format msgid "Closed, next iteration: %s ." msgstr "Geschlossen, nächste Iteration: %s ." -#: kallithea/model/scm.py:698 +#: kallithea/model/scm.py:668 msgid "latest tip" msgstr "Letzter Tip" -#: kallithea/model/user.py:189 +#: kallithea/model/ssh_key.py:56 +#, python-format +msgid "SSH key %r is invalid: %s" +msgstr "" + +#: kallithea/model/ssh_key.py:68 +#, python-format +msgid "SSH key %s is already used by %s" +msgstr "" + +#: kallithea/model/ssh_key.py:89 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "SSH key %r not found" +msgstr "Änderungssatz nicht gefunden" + +#: kallithea/model/user.py:186 msgid "New user registration" msgstr "Neue Benutzerregistrierung" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:250 #, fuzzy msgid "" "You can't remove this user since it is crucial for the entire application" @@ -1652,7 +1689,7 @@ "Sie können diesen Benutzer nicht löschen, da er von entscheidender " "Bedeutung für die gesamte Applikation ist" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:255 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1662,7 +1699,7 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder das " "Repository entfernt werden: %s" -#: kallithea/model/user.py:263 +#: kallithea/model/user.py:260 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch " @@ -1672,7 +1709,7 @@ "kann daher nicht entfernt werden. Entweder muss der Besitzer geändert " "oder die Repositorygruppen müssen entfernt werden: %s" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:267 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1682,16 +1719,16 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder die " "Benutzergruppen müssen gelöscht werden: %s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:361 msgid "Password reset link" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:408 #, fuzzy msgid "Password reset notification" msgstr "Link zum Zurücksetzen des Passworts" -#: 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 " @@ -1700,21 +1737,21 @@ "Das Passwort für dein Konto %s wurde mit dem Formular zum Zurücksetzen " "des Passworts geändert." -#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 +#: kallithea/model/validators.py:52 kallithea/model/validators.py:53 msgid "Value cannot be an empty list" msgstr "Eine leere Liste ist kein gültiger Wert" -#: kallithea/model/validators.py:74 +#: kallithea/model/validators.py:72 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Benutezrname \"%(username)s\" existiert bereits" -#: kallithea/model/validators.py:76 +#: kallithea/model/validators.py:74 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:78 +#: kallithea/model/validators.py:76 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or " @@ -1724,25 +1761,25 @@ "oder Bindestriche enthalten und muss mit einem alphanumerischen Zeichen " "oder einem Unterstrich beginnen" -#: kallithea/model/validators.py:105 +#: kallithea/model/validators.py:103 msgid "The input is not valid" msgstr "Die Eingabe ist nicht gültig" -#: kallithea/model/validators.py:112 +#: kallithea/model/validators.py:110 #, python-format msgid "Username %(username)s is not valid" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Ungültiger Benutzergruppenname" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Benutzergruppe \"%(usergroup)s\" existiert bereits" -#: kallithea/model/validators.py:136 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1751,68 +1788,64 @@ "Unterstriche, Punkte oder Bindestriche enthalten und muss mit einem " "alphanumerischen Zeichen beginnen" -#: kallithea/model/validators.py:176 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Kann diese Gruppe nicht als vorgesetzt setzen" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Gruppe \"%(group_name)s\" existiert bereits" -#: kallithea/model/validators.py:179 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Es gibt bereits ein Repository mit \"%(group_name)s\"" -#: kallithea/model/validators.py:235 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Üngültige(nicht ASCII) Zeichen im Passwort" -#: kallithea/model/validators.py:250 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Ungültiges altes Passwort" -#: kallithea/model/validators.py:266 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: kallithea/model/validators.py:281 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "Ungültiges Passwort" -#: kallithea/model/validators.py:312 -msgid "Token mismatch" -msgstr "Schlüssel stimmt nicht überein" - -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Repository Name \"%(repo)s\" ist nicht erlaubt" -#: kallithea/model/validators.py:330 +#: kallithea/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Es gibt bereits ein Repository mit \"%(repo)s\"" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" "Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe \"%(group)s" "\"" -#: kallithea/model/validators.py:333 +#: kallithea/model/validators.py:318 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Eine Repositorygruppe mit dem Namen \"%(repo)s\" existiert bereits" -#: kallithea/model/validators.py:419 +#: kallithea/model/validators.py:404 msgid "Invalid repository URL" msgstr "Ungültige Repository-URL" -#: kallithea/model/validators.py:420 +#: kallithea/model/validators.py:405 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -1820,44 +1853,44 @@ "Ungültige Repository-URL. Es muss eine gültige http, https, ssh, svn+http " "oder svn+https URL sein" -#: kallithea/model/validators.py:445 +#: kallithea/model/validators.py:430 msgid "Fork has to be the same type as parent" msgstr "Forke um den selben typ wie der Vorgesetze zu haben" -#: kallithea/model/validators.py:460 +#: kallithea/model/validators.py:445 msgid "You don't have permissions to create repository in this group" msgstr "" "Du hast nicht die erforderlichen Berechtigungen, um in dieser Gruppe ein " "Repository zu erzeugen" -#: kallithea/model/validators.py:462 +#: kallithea/model/validators.py:447 msgid "no permission to create repository in root location" msgstr "keine Berechtigung, um ein Repository auf höchster Ebene anzulegen" -#: kallithea/model/validators.py:512 +#: kallithea/model/validators.py:497 msgid "You don't have permissions to create a group in this location" msgstr "" "Sie haben keine Berechtigung, um an diesem Ort ein Repository anzulegen" -#: kallithea/model/validators.py:552 +#: kallithea/model/validators.py:537 msgid "This username or user group name is not valid" msgstr "Dieser Benutzername oder Benutzergruppenname ist nicht gültig" -#: kallithea/model/validators.py:645 +#: kallithea/model/validators.py:630 msgid "This is not a valid path" msgstr "Dies ist ein Ungültiger Pfad" -#: kallithea/model/validators.py:662 +#: kallithea/model/validators.py:647 #, fuzzy msgid "This email address is already in use" msgstr "Diese E-Mailaddresse ist bereits in Benutzung" -#: kallithea/model/validators.py:682 +#: kallithea/model/validators.py:667 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "E-MailAddresse \"%(email)s\" existiert nicht." -#: kallithea/model/validators.py:719 +#: kallithea/model/validators.py:704 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1865,11 +1898,11 @@ "Das LDAP-Login-Attribut des CN muss angeben werden - Es ist der Name des " "Attributes äquivalent zu \"Benutzername\"" -#: kallithea/model/validators.py:731 +#: kallithea/model/validators.py:716 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Bitte eine gültige IPv4- oder IPv6-Adresse angeben" -#: kallithea/model/validators.py:732 +#: kallithea/model/validators.py:717 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" @@ -1877,17 +1910,17 @@ "Die Größe (in Bits) des Netzwerks muss im Bereich 0-32 liegen (nicht " "%(bits)r)" -#: kallithea/model/validators.py:765 +#: kallithea/model/validators.py:750 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Der Name eines Schlüssels darf nur aus Buchstaben, Ziffern, Unterstrich " "und Bindestrich bestehen" -#: kallithea/model/validators.py:779 +#: kallithea/model/validators.py:764 msgid "Filename cannot be inside a directory" msgstr "Dateiname darf kein Unterverzeichnis enthalten" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:780 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -1930,24 +1963,30 @@ #: 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/my_account/my_account_ssh_keys.html:5 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: 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:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 #: 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/admin/users/user_edit_ssh_keys.html:5 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:58 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:60 #: kallithea/templates/email_templates/pull_request.html:37 #: kallithea/templates/forks/fork.html:34 #: kallithea/templates/index_base.html:58 #: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 #: kallithea/templates/pullrequests/pullrequest_show.html:59 -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:87 msgid "Description" msgstr "Beschreibung" @@ -1964,7 +2003,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 #: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:47 #: 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:42 @@ -1972,11 +2011,11 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:124 #: kallithea/templates/pullrequests/pullrequest_show.html:219 -#: kallithea/templates/summary/summary.html:124 +#: kallithea/templates/summary/summary.html:132 msgid "Owner" msgstr "Besitzer" -#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/base/base.html:380 kallithea/templates/login.html:5 #: kallithea/templates/login.html:19 msgid "Log In" msgstr "Log In" @@ -1991,7 +2030,7 @@ #: 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:371 +#: kallithea/templates/base/base.html:364 #: kallithea/templates/email_templates/registration.html:11 #: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" @@ -1999,7 +2038,7 @@ #: kallithea/templates/admin/my_account/my_account.html:27 #: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/base/base.html:368 kallithea/templates/login.html:34 #: kallithea/templates/register.html:38 msgid "Password" msgstr "Passwort" @@ -2165,10 +2204,12 @@ #: kallithea/templates/admin/admin_log.html:6 #: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:7 #: 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/user_edit_ssh_keys.html:7 #: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Aktion" @@ -2221,22 +2262,22 @@ msgstr "Plugin" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/defaults/defaults.html:59 #: 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:95 #: 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/repo_groups/repo_group_edit_settings.html:27 #: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:99 #: 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/templates/base/default_perms_box.html:42 msgid "Save" msgstr "Speichern" @@ -2254,14 +2295,14 @@ #: kallithea/templates/admin/defaults/defaults.html:34 #: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Privates Repository" #: kallithea/templates/admin/defaults/defaults.html:37 #: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2271,36 +2312,25 @@ "sichtbar." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics" msgstr "Aktiviere Statistiken" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:72 msgid "Enable statistics window on summary page." msgstr "Statistik-Fenster in der Zusammenfassungsseite aktivieren." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable downloads" msgstr "Aktiviere Downloads" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 msgid "Enable download menu on summary page." msgstr "Download-Menü auf der Zusammenfassungsseite aktivieren." -#: 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:78 -msgid "Enable locking" -msgstr "Locking aktivieren" - -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -msgid "Enable lock-by-pulling on repository." -msgstr "Aktivieren Sie Lock-by-Pulling im Repository." - #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" @@ -2349,8 +2379,10 @@ #: 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/my_account/my_account_ssh_keys.html:21 #: 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_ssh_keys.html:21 #, fuzzy msgid "Never" msgstr "nie" @@ -2384,7 +2416,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:305 msgid "Create New Gist" msgstr "Neuen Gist erstellen" @@ -2422,23 +2454,25 @@ #: 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/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:96 #: 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/repo_groups/repo_group_edit_settings.html:28 #: 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:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:100 #: 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/settings/settings_vcs.html:66 +#: kallithea/templates/admin/settings/settings_visual.html:127 #: 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/admin/users/user_edit_ssh_keys.html:66 +#: kallithea/templates/base/default_perms_box.html:43 #: kallithea/templates/files/files_add.html:69 #: kallithea/templates/files/files_delete.html:41 #: kallithea/templates/files/files_edit.html:72 @@ -2466,7 +2500,7 @@ #: kallithea/templates/admin/gists/show.html:54 #: kallithea/templates/admin/my_account/my_account_emails.html:23 #: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #: 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 @@ -2526,7 +2560,7 @@ #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:397 +#: kallithea/templates/base/base.html:390 msgid "My Account" msgstr "Mein Account" @@ -2539,24 +2573,31 @@ msgid "Email Addresses" msgstr "E-Mail-Adressen" -#: kallithea/templates/admin/my_account/my_account.html:28 -#: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +#, fuzzy +#| msgid "API Keys" +msgid "SSH Keys" +msgstr "API Keys" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/users/user_edit.html:34 msgid "API Keys" msgstr "API Keys" -#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/templates/admin/my_account/my_account.html:32 msgid "Owned Repositories" msgstr "Eigene Repositories" -#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/admin/my_account/my_account.html:33 #: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "Beobachtete Repositories" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:34 #: 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/templates/admin/users/user_edit.html:37 msgid "Show Permissions" msgstr "Berechtigungen anzeigen" @@ -2583,7 +2624,9 @@ msgstr "Entfernen des API-Schlüssels \"%s\" bestätigen" #: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:30 #: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:30 msgid "Remove" msgstr "Entfernen" @@ -2599,12 +2642,14 @@ #: kallithea/templates/admin/my_account/my_account_api_keys.html:72 #: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: 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/templates/admin/users/user_edit_ssh_keys.html:65 msgid "Add" msgstr "Hinzufügen" @@ -2719,6 +2764,49 @@ msgid "Name" msgstr "Name" +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:4 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:4 +msgid "Fingerprint" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:6 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:6 +#, fuzzy +#| msgid "Last Name" +msgid "Last Used" +msgstr "Nachname" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:28 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:28 +#, fuzzy, python-format +#| msgid "Confirm to remove this API key: %s" +msgid "Confirm to remove this SSH key: %s" +msgstr "Entfernen des API-Schlüssels \"%s\" bestätigen" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:39 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:39 +msgid "No SSH keys have been added" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:49 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:49 +#, fuzzy +#| msgid "New API key" +msgid "New SSH key" +msgstr "Neuer API-Schlüssel" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:52 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:52 +#, fuzzy +#| msgid "Public Gist" +msgid "Public key" +msgstr "Öffentlicher Gist" + +#: kallithea/templates/admin/my_account/my_account_ssh_keys.html:54 +#: kallithea/templates/admin/users/user_edit_ssh_keys.html:54 +msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)" +msgstr "" + #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Repositories, denen Sie folgen" @@ -2735,7 +2823,7 @@ msgstr "Global" #: kallithea/templates/admin/permissions/permissions.html:29 -#: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:35 msgid "IP Whitelist" msgstr "IP Whitelist" @@ -2778,7 +2866,7 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:27 #: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:33 #: kallithea/templates/data_table/_dt_elements.html:134 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2956,7 +3044,7 @@ #: 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/templates/admin/users/user_edit.html:36 msgid "Advanced" msgstr "Erweitert" @@ -3068,19 +3156,11 @@ "untergeordneten Elemente, einschließlich nicht-privater Repositories und " "anderer Gruppen, falls ausgewählt." -#: 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 "" -"Aktiviere die Sperre-bei-Pull für die Gruppe. Diese Option wird auf alle " -"anderen enthaltenen Gruppen und Repositories angewandt" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Remove this group" msgstr "Diese Gruppe löschen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "Confirm to delete this group" msgstr "Löschen der Gruppe bestätigen" @@ -3110,7 +3190,7 @@ "Repository als Clon von dieser URL erstellt." #: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3119,7 +3199,7 @@ "längere Beschreibungen." #: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:36 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" @@ -3131,7 +3211,7 @@ msgstr "Repository Typ der erstellt werden soll." #: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_settings.html:40 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Start Revision" @@ -3190,8 +3270,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/templates/summary/summary.html:162 +#: kallithea/templates/summary/summary.html:169 +#: kallithea/templates/summary/summary.html:170 msgid "Statistics" msgstr "Statistiken" @@ -3228,73 +3308,32 @@ "Alle Aktionen, die in diesem Repository ausgeführt wurden, sind im " "öffentlichen Logbuch für jeden einsehbar." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -msgid "Change Locking" -msgstr "Ändere die Sperrung" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -msgid "Confirm to unlock repository." -msgstr "Entsperren des Repositorys bestätigen." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -msgid "Unlock Repository" -msgstr "Repository entsperren" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#, python-format -msgid "Locked by %s on %s" -msgstr "Gesperrt durch %s auf %s" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -msgid "Confirm to lock repository." -msgstr "Sperren des Repositorys bestätigen." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -msgid "Lock Repository" -msgstr "Repository sperren" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Repository is not locked" -msgstr "Repository ist nicht gesperrt" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -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 "" -"Erzwinge die Sperre dieses Repositories. Dies funktioniert nur, falls " -"anonymer Zugang abgeschaltet ist. Ein Pull führt zur Sperre des " -"Repositories. Der pullende Nutzer sperrt das Repository; nur dieser " -"Nutzer kann die Sperre durch eine Push-Operation wieder aufheben." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 #: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Löschen des Repositorys bestätigen: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Delete this Repository" msgstr "Dieses Repository löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:51 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Dieses Repository hat %s Fork" msgstr[1] "Dieses Repository hat %s Forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Detach forks" msgstr "Fork abtrennen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Delete forks" msgstr "Forks löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3396,19 +3435,13 @@ msgid "This repository does not have a remote repository URL." msgstr "Für dieses Repository ist keine nicht-lokale URL angegeben." -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "Permanent Repository ID" +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#, fuzzy +#| msgid "Permanent Repository ID" +msgid "Permanent URL" msgstr "Dauerhafte Repository-Kennung" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -msgid "What is that?" -msgstr "Was ist das?" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 -msgid "URL by id" -msgstr "URL nach Kennung" - -#: 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" @@ -3424,15 +3457,15 @@ "Dies ist insbesondere für CI-Systeme oder in Fällen nützlich, in denen " "die URL des Repositories bei Dritten dauerhaft eingetragen wird." -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Entferntes Repository" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:24 msgid "Repository URL" msgstr "Repository URL" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3440,16 +3473,16 @@ "Optional: URL eines entfernten Repositories. Falls gesetzt, dann kann das " "Repository von dieser URL bezogen werden." -#: kallithea/templates/admin/repos/repo_edit_settings.html:38 +#: kallithea/templates/admin/repos/repo_edit_settings.html:43 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Standardrevision für Dateiseite, Downloads, Whoosh und Readme" -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" msgstr "Typname des Benutzers" -#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:50 msgid "Change owner of this repository." msgstr "Besitzer des Repositorys ändern." @@ -3561,8 +3594,8 @@ "einstellen, wird das Captcha bei der Registrierung aktiviert." #: 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/templates/admin/settings/settings_vcs.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:126 msgid "Save Settings" msgstr "Einstellungen speichern" @@ -3579,9 +3612,9 @@ "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -"Mit Hilfe von Hooks können bei bestimmten Ereignissen, wie z.B. Push / Pull, " -"Aktionen ausgelöst werden. Sie können Python-Funktionen oder externe " -"Anwendungen auslösen." +"Mit Hilfe von Hooks können bei bestimmten Ereignissen, wie z.B. Push / " +"Pull, Aktionen ausgelöst werden. Sie können Python-Funktionen oder " +"externe Anwendungen auslösen." #: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" @@ -3603,8 +3636,8 @@ "related to repositories that no longer exist in the filesystem." msgstr "" "Aktivieren Sie diese Option, um alle Kommentare, Pull-Requests und andere " -"Datensätze zu entfernen, die sich auf Repositories beziehen, die nicht mehr " -"im Dateisystem vorhanden sind." +"Datensätze zu entfernen, die sich auf Repositories beziehen, die nicht " +"mehr im Dateisystem vorhanden sind." #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" @@ -3626,7 +3659,8 @@ "Current hooks will be updated to the latest version." msgstr "" "Überprüfen Sie, ob die Git-Hooks von Kallithea für jedes Repository " -"installiert sind. Aktuelle Hooks werden auf die neueste Version aktualisiert." +"installiert sind. Aktuelle Hooks werden auf die neueste Version " +"aktualisiert." #: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" @@ -3638,9 +3672,9 @@ "not seem to come from Kallithea. WARNING: This operation will destroy any " "custom git hooks you may have deployed by hand!" msgstr "" -"Wenn Sie Git-Hooks installieren, überschreiben Sie alle vorhandenen Hooks, " -"auch wenn sie nicht von Kallithea zu kommen scheinen. WARNUNG: Diese " -"Operation zerstört alle benutzerdefinierten Git-Hooks, die Sie " +"Wenn Sie Git-Hooks installieren, überschreiben Sie alle vorhandenen " +"Hooks, auch wenn sie nicht von Kallithea zu kommen scheinen. WARNUNG: " +"Diese Operation zerstört alle benutzerdefinierten Git-Hooks, die Sie " "möglicherweise von Hand bereitgestellt haben!" #: kallithea/templates/admin/settings/settings_mapping.html:41 @@ -3660,8 +3694,8 @@ "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -"Diese Option führt zu einer vollständigen Neuindizierung aller Repositories " -"für eine korrekte Volltextsuche." +"Diese Option führt zu einer vollständigen Neuindizierung aller " +"Repositories für eine korrekte Volltextsuche." #: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" @@ -3675,11 +3709,6 @@ msgid "Kallithea version" msgstr "Kallithea-Version" -#: kallithea/templates/admin/settings/settings_system.html:7 -#, fuzzy -msgid "Check for updates" -msgstr "Auf Updates prüfen" - #: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "Kallithea Konfigurationsdatei" @@ -3700,17 +3729,7 @@ msgid "Git path" msgstr "Git-Pfad" -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Upgrade info endpoint" -msgstr "Upgrade-Info-Endpunkt" - -#: kallithea/templates/admin/settings/settings_system.html:13 -msgid "Note: please make sure this server can access this URL" -msgstr "" -"Hinweis: Bitte stellen Sie sicher, dass der Server auf die URL zugreifen " -"kann" - -#: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/templates/admin/settings/settings_system.html:22 msgid "Python Packages" msgstr "Python-Pakete" @@ -3719,43 +3738,35 @@ msgstr "Zeigt die Größe des Repositories nach dem Push an" #: kallithea/templates/admin/settings/settings_vcs.html:15 -msgid "Log user push commands" -msgstr "Protokollieren der Push-Befehle der Benutzer" - -#: kallithea/templates/admin/settings/settings_vcs.html:21 -msgid "Log user pull commands" -msgstr "Protokollieren der Pull-Befehle des Benutzers" - -#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Repository nach dem Push aktualisieren (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Mercurial extensions" msgstr "Mercurial-Erweiterungen" -#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/templates/admin/settings/settings_vcs.html:26 msgid "Enable largefiles extension" msgstr "Erweiterung largefiles aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Enable hgsubversion extension" msgstr "Erweiterung hgsubversion aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:35 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" "Erfordert die Installation der hgsubversion-Bibliothek. Ermöglicht das " -"Klonen von entfernten Subversion-Repositories während der Konvertierung zu " -"Mercurial." - -#: kallithea/templates/admin/settings/settings_vcs.html:59 +"Klonen von entfernten Subversion-Repositories während der Konvertierung " +"zu Mercurial." + +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Location of repositories" msgstr "Ort der Repositories" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect." @@ -3763,14 +3774,14 @@ "Zum Entsperren klicken. Sie müssen Kallithea neu starten, damit diese " "Einstellung wirksam wird." -#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -"Dateisystem-Speicherort, an dem die Repositories gespeichert sind. Nach dem " -"Ändern dieses Wertes sind sowohl ein Neustart als auch ein erneuter Scan des " -"Repository-Ordners erforderlich." +"Dateisystem-Speicherort, an dem die Repositories gespeichert sind. Nach " +"dem Ändern dieses Wertes sind sowohl ein Neustart als auch ein erneuter " +"Scan des Repository-Ordners erforderlich." #: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" @@ -3794,8 +3805,8 @@ msgid "" "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -"Zeigt oder verbirgt eine Versionsnummer von Kallithea, die in der Fußzeile " -"angezeigt wird." +"Zeigt oder verbirgt eine Versionsnummer von Kallithea, die in der " +"Fußzeile angezeigt wird." #: kallithea/templates/admin/settings/settings_visual.html:25 msgid "Show user Gravatars" @@ -3821,23 +3832,40 @@ "verwenden.\n" " Die folgenden " "Variablen der URL werden entsprechend ersetzt.\n" -" {scheme} 'http' " -"oder'https', die vom laufenden Kallithea-Server gesendet werden,\n" +" {scheme} " +"'http' oder'https', die vom laufenden Kallithea-Server gesendet werden,\n" " {email} " "Benutzer-E-Mail,\n" -" {md5email} md5 Hash " -"der Benutzer-E-Mail (wie bei gravatar.com),\n" -" {size} Größe " -"des Bildes, das von der Serveranwendung erwartet wird,\n" +" {md5email} md5 " +"Hash der Benutzer-E-Mail (wie bei gravatar.com),\n" +" {size} " +"Größe des Bildes, das von der Serveranwendung erwartet wird,\n" " {netloc} " "Netzwerkstandort/Server-Host des laufenden Kallithea-Servers" #: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:63 -msgid "Clone URL" +#, fuzzy +#| msgid "Clone URL" +msgid "HTTP Clone URL" msgstr "Clone-URL" #: kallithea/templates/admin/settings/settings_visual.html:43 +#, fuzzy +#| 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" msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" "{repo}'.\n" @@ -3852,70 +3880,89 @@ " {repo} full " "repository name,\n" " {repoid} ID of " -"repository, can be used to construct clone-by-id" -msgstr "" -"Schema der Klon-URL-Konstruktion z.B. '{scheme}://{user}@{netloc}/{repo}'.\n" -" Die folgenden Variablen " -"stehen zur Verfügung:\n" +"repository, can be used to construct clone-by-id,\n" +" {system_user} name " +"of the Kallithea system user,\n" +" {hostname} server " +"hostname\n" +" " +msgstr "" +"Schema der Klon-URL-Konstruktion z.B. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" Die folgenden " +"Variablen stehen zur Verfügung:\n" " {scheme}'http' " "oder'https', die vom laufenden Kallithea-Server gesendet werden,\n" " {user} aktueller " "Benutzername des Benutzers,\n" " {netloc} " "Netzwerkstandort/Server-Host des laufenden Kallithea-Servers,\n" -" {repo} vollständiger " -"Name des Repositories,\n" +" {repo} " +"vollständiger Name des Repositories,\n" " {repoid} ID des " "Repositorys, kann verwendet werden, um einen Klon nach Id zu erstellen" -#: kallithea/templates/admin/settings/settings_visual.html:54 +#: kallithea/templates/admin/settings/settings_visual.html:56 +#, fuzzy +#| msgid "Clone URL" +msgid "SSH Clone URL" +msgstr "Clone-URL" + +#: kallithea/templates/admin/settings/settings_visual.html:59 +msgid "" +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 #, fuzzy #| msgid "Repository Size" msgid "Repository page size" msgstr "Repository Größe" -#: kallithea/templates/admin/settings/settings_visual.html:57 +#: kallithea/templates/admin/settings/settings_visual.html:68 msgid "" "Number of items displayed in the repository pages before pagination is " "shown." msgstr "" -"Anzahl der Elemente, die auf den Repository-Seiten angezeigt werden, bevor " -"der Seitenumbruch angezeigt wird." - -#: kallithea/templates/admin/settings/settings_visual.html:62 +"Anzahl der Elemente, die auf den Repository-Seiten angezeigt werden, " +"bevor der Seitenumbruch angezeigt wird." + +#: kallithea/templates/admin/settings/settings_visual.html:73 msgid "Admin page size" msgstr "Größe der Admin-Seite" -#: kallithea/templates/admin/settings/settings_visual.html:65 +#: kallithea/templates/admin/settings/settings_visual.html:76 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -"Anzahl der Elemente, die in den Gittern der Admin-Seiten angezeigt werden, " -"bevor der Seitenumbruch angezeigt wird." - -#: kallithea/templates/admin/settings/settings_visual.html:70 +"Anzahl der Elemente, die in den Gittern der Admin-Seiten angezeigt " +"werden, bevor der Seitenumbruch angezeigt wird." + +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Icons" msgstr "Icons" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public repository icon on repositories" msgstr "Öffentliches Repository-Symbol in Repositories anzeigen" -#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Show private repository icon on repositories" msgstr "Privates Repository-Symbol in Repositories anzeigen" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:95 msgid "Show public/private icons next to repository names." -msgstr "Zeigt öffentliche/private Symbole neben den Namen der Repositories an." - -#: kallithea/templates/admin/settings/settings_visual.html:89 +msgstr "" +"Zeigt öffentliche/private Symbole neben den Namen der Repositories an." + +#: kallithea/templates/admin/settings/settings_visual.html:100 #, fuzzy msgid "Meta Tagging" msgstr "Einstellungen" -#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/templates/admin/settings/settings_visual.html:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." @@ -3923,7 +3970,7 @@ "Analysiert Meta-Tags aus dem Beschreibungsfeld des Repositorys und " "verwandelt sie in farbige Tags." -#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/templates/admin/settings/settings_visual.html:109 msgid "Stylify recognised meta tags:" msgstr "Erkannte Meta-Tags stilisieren:" @@ -4085,12 +4132,12 @@ msgstr "Support" #: kallithea/templates/base/base.html:86 -#: kallithea/templates/base/base.html:424 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Mercurial Repository" #: kallithea/templates/base/base.html:89 -#: kallithea/templates/base/base.html:427 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Git Repository" @@ -4138,158 +4185,132 @@ msgstr "" #: kallithea/templates/base/base.html:160 -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:315 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:164 -msgid "Unlock" -msgstr "" - -#: kallithea/templates/base/base.html:166 -msgid "Lock" -msgstr "" - -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:167 msgid "Follow" msgstr "" -#: kallithea/templates/base/base.html:175 +#: kallithea/templates/base/base.html:168 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:171 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:179 +#: kallithea/templates/base/base.html:172 #: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:191 +#: kallithea/templates/base/base.html:184 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:452 +#: kallithea/templates/base/base.html:196 +#: kallithea/templates/base/base.html:445 msgid "No matches found" msgstr "Keine Übereinstimmungen gefunden" +#: kallithea/templates/base/base.html:289 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:295 #: kallithea/templates/base/base.html:296 -msgid "Show recent activity" +msgid "Public journal" +msgstr "Öffentliches Logbuch" + +#: kallithea/templates/base/base.html:301 +msgid "Show public gists" msgstr "" #: kallithea/templates/base/base.html:302 -#: kallithea/templates/base/base.html:303 -msgid "Public journal" -msgstr "Öffentliches Logbuch" +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:306 +msgid "All Public Gists" +msgstr "" #: kallithea/templates/base/base.html:308 -msgid "Show public gists" +msgid "My Public Gists" msgstr "" #: kallithea/templates/base/base.html:309 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:313 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:315 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:314 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:344 -#: kallithea/templates/base/base.html:345 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:338 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Meine Pull Requests" -#: kallithea/templates/base/base.html:360 +#: kallithea/templates/base/base.html:353 msgid "Not Logged In" msgstr "Nicht eingeloggt" -#: kallithea/templates/base/base.html:369 +#: kallithea/templates/base/base.html:362 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:379 +#: kallithea/templates/base/base.html:372 #, fuzzy #| msgid "Forgot password ?" msgid "Forgot password?" msgstr "Passwort vergessen?" -#: kallithea/templates/base/base.html:383 +#: kallithea/templates/base/base.html:376 #, fuzzy #| msgid "Don't have an account ?" msgid "Don't have an account?" msgstr "Kein Account?" -#: kallithea/templates/base/base.html:400 +#: kallithea/templates/base/base.html:393 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:517 msgid "Parent rev." msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:526 msgid "Child rev." msgstr "" #: kallithea/templates/base/default_perms_box.html:11 -#, fuzzy -msgid "Inherit defaults" -msgstr "Repositorystandards" +msgid "Create repositories" +msgstr "" #: kallithea/templates/base/default_perms_box.html:15 -#, python-format -msgid "" -"Select to inherit global settings, IP whitelist and permissions from the " -"%s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:16 -#, fuzzy -#| msgid "Default permissions" -msgid "default permissions" -msgstr "Standart Rechte" - -#: kallithea/templates/base/default_perms_box.html:23 -msgid "Create repositories" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:21 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/templates/base/default_perms_box.html:35 msgid "Select this option to allow repository forking for this user" msgstr "" @@ -5040,7 +5061,7 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 +#: kallithea/templates/files/files.html:74 #, python-format msgid "%s Files" msgstr "" @@ -5052,7 +5073,7 @@ #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/templates/summary/summary.html:191 +#: kallithea/templates/summary/summary.html:199 msgid "Add New File" msgstr "" @@ -5105,7 +5126,7 @@ msgstr "" #: kallithea/templates/files/files_browser.html:55 -#: kallithea/templates/summary/summary.html:145 +#: kallithea/templates/summary/summary.html:153 msgid "Size" msgstr "Größe" @@ -5235,8 +5256,8 @@ msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/templates/summary/summary.html:131 +#: kallithea/templates/summary/summary.html:138 +#: kallithea/templates/summary/summary.html:139 msgid "Followers" msgstr "" @@ -5287,8 +5308,8 @@ msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/templates/summary/summary.html:137 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/templates/summary/summary.html:145 msgid "Forks" msgstr "" @@ -5601,9 +5622,9 @@ msgid "File names" msgstr "Dateinamen" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 +#: kallithea/templates/search/search_commit.html:30 +#: kallithea/templates/search/search_content.html:18 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -5613,20 +5634,20 @@ msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:36 +#: kallithea/templates/summary/summary.html:27 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:37 +#: kallithea/templates/summary/summary.html:28 #, python-format msgid "%s RSS feed" msgstr "" #: kallithea/templates/summary/statistics.html:35 -#: kallithea/templates/summary/summary.html:91 -#: kallithea/templates/summary/summary.html:105 +#: kallithea/templates/summary/summary.html:99 +#: kallithea/templates/summary/summary.html:113 msgid "Enable" msgstr "Aktiviere" @@ -5635,12 +5656,12 @@ msgstr "" #: kallithea/templates/summary/statistics.html:87 -#: kallithea/templates/summary/summary.html:354 +#: kallithea/templates/summary/summary.html:371 msgid "files" msgstr "Dateien" #: kallithea/templates/summary/statistics.html:111 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/templates/summary/summary.html:401 msgid "Show more" msgstr "Mehr anzeigen" @@ -5681,95 +5702,197 @@ msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:14 -#, python-format -msgid "Repository locked by %s" -msgstr "" - -#: kallithea/templates/summary/summary.html:16 -msgid "Repository unlocked" -msgstr "" - -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:13 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:27 +#: kallithea/templates/summary/summary.html:18 msgid "Clone from" msgstr "Clone von" -#: kallithea/templates/summary/summary.html:68 -msgid "Show by ID" -msgstr "" - +#: kallithea/templates/summary/summary.html:54 +msgid "Clone URL" +msgstr "Clone-URL" + +#: kallithea/templates/summary/summary.html:63 +msgid "Use ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:65 #: kallithea/templates/summary/summary.html:73 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:84 +msgid "Use SSH" +msgstr "" + +#: kallithea/templates/summary/summary.html:71 +#, fuzzy +#| msgid "Last Name" +msgid "Use Name" +msgstr "Nachname" + +#: kallithea/templates/summary/summary.html:80 +msgid "Use HTTP" +msgstr "" + +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:98 +#: kallithea/templates/summary/summary.html:106 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:101 -msgid "There are no downloads yet" -msgstr "" - -#: kallithea/templates/summary/summary.html:103 -msgid "Downloads are disabled for this repository" -msgstr "" - #: kallithea/templates/summary/summary.html:109 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:111 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:117 msgid "Download as zip" msgstr "Herunterladen als zip" -#: kallithea/templates/summary/summary.html:113 +#: kallithea/templates/summary/summary.html:121 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:115 +#: kallithea/templates/summary/summary.html:123 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:153 -#: kallithea/templates/summary/summary.html:155 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:163 msgid "Feed" msgstr "Feed" -#: kallithea/templates/summary/summary.html:175 +#: kallithea/templates/summary/summary.html:183 msgid "Latest Changes" msgstr "Letzte Änderungen" -#: kallithea/templates/summary/summary.html:177 +#: kallithea/templates/summary/summary.html:185 msgid "Quick Start" msgstr "Schnelleinstieg" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:196 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/summary/summary.html:196 +#: kallithea/templates/summary/summary.html:204 #, fuzzy msgid "Push new repository" msgstr "privates Repository" -#: kallithea/templates/summary/summary.html:204 +#: kallithea/templates/summary/summary.html:212 msgid "Existing repository?" msgstr "" -#: kallithea/templates/summary/summary.html:222 +#: kallithea/templates/summary/summary.html:230 #, python-format msgid "Readme file from revision %s:%s" msgstr "Liesmich-Datei von Revision %s:%s" -#: kallithea/templates/summary/summary.html:298 +#: kallithea/templates/summary/summary.html:315 #, python-format msgid "Download %s as %s" msgstr "%s als %s herunterladen" +#~ msgid "This repository has been locked by %s on %s" +#~ msgstr "Dieses Repository ist von %s am %s gesperrt worden" + +#~ msgid "Repository has been locked" +#~ msgstr "Repository wurde gesperrt" + +#~ msgid "Repository has been unlocked" +#~ msgstr "Repository nicht mehr gesperrt" + +#~ msgid "An error occurred during unlocking" +#~ msgstr "Fehler beim Entsperren" + +#~ msgid "Invalid API key" +#~ msgstr "Ungültiger API Key" + +#~ msgid "Token mismatch" +#~ msgstr "Schlüssel stimmt nicht überein" + +#~ msgid "Enable locking" +#~ msgstr "Locking aktivieren" + +#~ msgid "Enable lock-by-pulling on repository." +#~ msgstr "Aktivieren Sie Lock-by-Pulling im Repository." + +#~ msgid "" +#~ "Enable lock-by-pulling on group. This option will be applied to all " +#~ "other groups and repositories inside" +#~ msgstr "" +#~ "Aktiviere die Sperre-bei-Pull für die Gruppe. Diese Option wird auf " +#~ "alle anderen enthaltenen Gruppen und Repositories angewandt" + +#~ msgid "Change Locking" +#~ msgstr "Ändere die Sperrung" + +#~ msgid "Confirm to unlock repository." +#~ msgstr "Entsperren des Repositorys bestätigen." + +#~ msgid "Unlock Repository" +#~ msgstr "Repository entsperren" + +#~ msgid "Locked by %s on %s" +#~ msgstr "Gesperrt durch %s auf %s" + +#~ msgid "Confirm to lock repository." +#~ msgstr "Sperren des Repositorys bestätigen." + +#~ msgid "Lock Repository" +#~ msgstr "Repository sperren" + +#~ msgid "Repository is not locked" +#~ msgstr "Repository ist nicht gesperrt" + +#~ 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 "" +#~ "Erzwinge die Sperre dieses Repositories. Dies funktioniert nur, falls " +#~ "anonymer Zugang abgeschaltet ist. Ein Pull führt zur Sperre des " +#~ "Repositories. Der pullende Nutzer sperrt das Repository; nur dieser " +#~ "Nutzer kann die Sperre durch eine Push-Operation wieder aufheben." + +#~ msgid "What is that?" +#~ msgstr "Was ist das?" + +#~ msgid "URL by id" +#~ msgstr "URL nach Kennung" + +#, fuzzy +#~ msgid "Check for updates" +#~ msgstr "Auf Updates prüfen" + +#~ msgid "Upgrade info endpoint" +#~ msgstr "Upgrade-Info-Endpunkt" + +#~ msgid "Note: please make sure this server can access this URL" +#~ msgstr "" +#~ "Hinweis: Bitte stellen Sie sicher, dass der Server auf die URL " +#~ "zugreifen kann" + +#~ msgid "Log user push commands" +#~ msgstr "Protokollieren der Push-Befehle der Benutzer" + +#~ msgid "Log user pull commands" +#~ msgstr "Protokollieren der Pull-Befehle des Benutzers" + +#, fuzzy +#~ msgid "Inherit defaults" +#~ msgstr "Repositorystandards" + +#, fuzzy +#~| msgid "Default permissions" +#~ msgid "default permissions" +#~ msgstr "Standart Rechte" + #~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "" #~ "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer " @@ -5943,9 +6066,6 @@ #~ msgid "invalid user name" #~ msgstr "Ungültiger Benutzername" -#~ msgid "Your account is disabled" -#~ msgstr "Ihr Account wurde Deaktiviert" - #~ msgid "invalid clone URL" #~ msgstr "ungültige Clone-URL"