Mercurial > kallithea
changeset 5729:bc6178c3b67b
i18n: updated translation for Greek
Currently translated at 10.9% (124 of 1132 strings)
| author | Asterios Dimitriou <steve@pci.gr> |
|---|---|
| date | Wed, 10 Feb 2016 12:01:22 +0000 |
| parents | 29807a520acc |
| children | ba3bdd16ca2d |
| files | kallithea/i18n/el/LC_MESSAGES/kallithea.po |
| diffstat | 1 files changed, 776 insertions(+), 707 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Wed Feb 24 16:35:32 2016 +0100 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Wed Feb 10 12:01:22 2016 +0000 @@ -1,4 +1,4 @@ -# Translations template for Kallithea. +# Greek translations for Kallithea. # Copyright (C) 2015 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # Automatically generated, 2015. @@ -7,11 +7,11 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2015-09-08 10:34+0200\n" -"PO-Revision-Date: 2016-01-27 18:56+0000\n" +"POT-Creation-Date: 2016-02-22 19:35+0100\n" +"PO-Revision-Date: 2016-02-10 12:01+0000\n" "Last-Translator: Asterios Dimitriou <steve@pci.gr>\n" "Language-Team: Greek " -"<https://hosted.weblate.org/projects/kallithea/stable/el/>\n" +"<https://hosted.weblate.org/projects/kallithea/kallithea/el/>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,12 +19,12 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.5-dev\n" -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/changelog.py:85 +#: kallithea/controllers/pullrequests.py:237 kallithea/lib/base.py:515 msgid "There are no changesets yet" msgstr "Δεν υπάρχουν σετ αλλαγών ακόμα" -#: kallithea/controllers/changelog.py:166 +#: kallithea/controllers/changelog.py:164 #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:69 @@ -34,39 +34,31 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" -msgstr "Καμία" - -#: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196 +msgstr "Χωρίς" + +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(κλειστό)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:88 msgid "Show whitespace" msgstr "Εμφάνιση κενού" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Αγνόηση κενού" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:168 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Αύξηση του diff πλαισίου σε %(num)s γραμμές" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:743 msgid "Such revision does not exist for this repository" msgstr "Δεν υπάρχει τέτοια αναθεώρηση για αυτό το αποθετήριο" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is not " -"allowed" -msgstr "" -"Η αλλαγή της κατάστασης ενός σετ αλλαγών σχετιζόμενων με μια κλειστή αίτηση " -"έλξης(pull request) δεν επιτρέπεται" - #: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 msgid "Select changeset" msgstr "Επιλογή σετ αλλαγών" @@ -86,8 +78,7 @@ msgstr "Άγνωστο λάθος" #: kallithea/controllers/error.py:100 -msgid "" -"The request could not be understood by the server due to malformed syntax." +msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Η αίτηση δεν μπόρεσε να ερμηνευτεί από τον εξυπηρετητή λόγω κακής " "διατύπωσης." @@ -125,10 +116,10 @@ #: kallithea/controllers/feed.py:87 #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/compare/compare_diff.html:84 +#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/pullrequests/pullrequest_show.html:350 +#: kallithea/templates/pullrequests/pullrequest_show.html:372 msgid "Changeset was too big and was cut off..." msgstr "Το σετ αλλαγών ήταν πολύ μεγάλο και περικόπηκε..." @@ -146,106 +137,111 @@ msgid "There are no files yet. %s" msgstr "Δεν υπάρχουν αρχεία ακόμα. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "%s την %s" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 +#: kallithea/controllers/files.py:433 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Το αποθετήριο κλειδώθηκε από %s την %s" -#: kallithea/controllers/files.py:317 -msgid "You can only delete files with revision being a valid branch " -msgstr "" -"Μπορείτε να διαγράψετε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε έγκυρη " -"διακλάδωση " - -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:318 +#, fuzzy +#| msgid "You can only delete files with revision being a valid branch " +msgid "You can only delete files with revision being a valid branch" +msgstr "" +"Μπορείτε να διαγράψετε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε έγκυρη" +" διακλάδωση " + +#: kallithea/controllers/files.py:329 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Διαγραφή αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:351 #, python-format msgid "Successfully deleted file %s" msgstr "Επιτυχής διαγραφή αρχείου %s" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 +#: kallithea/controllers/files.py:502 msgid "Error occurred during commit" msgstr "Συνέβη λάθος κατά το commit" -#: kallithea/controllers/files.py:377 -msgid "You can only edit files with revision being a valid branch " +#: kallithea/controllers/files.py:378 +#, fuzzy +#| msgid "You can only edit files with revision being a valid branch " +msgid "You can only edit files with revision being a valid branch" msgstr "" "Μπορείτε να επεξεργαστείτε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε " "έγκυρη διακλάδωση " -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:392 #, python-format msgid "Edited file %s via Kallithea" msgstr "Επεξεργασία αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:408 msgid "No changes" msgstr "Καμία αλλαγή" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 #, python-format msgid "Successfully committed to %s" msgstr "Επιτυχής παράδοση σε %s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:444 msgid "Added file via Kallithea" msgstr "Προσθήκη αρχείου μέσω Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:465 msgid "No content" msgstr "Χωρίς περιεχόμενο" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:469 msgid "No filename" msgstr "Χωρίς όνομα αρχείου" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:494 msgid "Location must be relative path and must not contain .. in path" msgstr "" -"Η τοποθεσία πρέπει να είναι σχετική διαδρομή και να μην περιέχει .. μέσα της" - -#: kallithea/controllers/files.py:526 +"Η τοποθεσία πρέπει να είναι σχετική διαδρομή και να μην περιέχει .. μέσα " +"της" + +#: kallithea/controllers/files.py:527 msgid "Downloads disabled" msgstr "Οι μεταφορτώσεις απενεργοποιήθηκαν" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:538 #, python-format msgid "Unknown revision %s" msgstr "Άγνωστη αναθεώρηση %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:540 msgid "Empty repository" msgstr "Άδειο αποθετήριο" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:542 msgid "Unknown archive type" msgstr "Άγνωστος τύπος αρχειοθέτησης" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:772 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:15 #: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Σετ αλλαγών" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 +#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:175 #: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 #: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Κλάδοι" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 +#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:176 #: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 #: kallithea/templates/tags/tags.html:10 msgid "Tags" @@ -268,8 +264,8 @@ #: kallithea/templates/admin/users/user_edit_advanced.html:6 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 #: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:479 +#: kallithea/templates/base/base.html:653 msgid "Repositories" msgstr "Αποθετήρια" @@ -280,11 +276,15 @@ msgid "Branch" msgstr "Κλάδος" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:136 kallithea/templates/switch_to_list.html:16 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:142 msgid "Tag" msgstr "Ετικέτα" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:148 msgid "Bookmark" msgstr "Σελιδοδείκτης" @@ -295,99 +295,98 @@ msgstr "Δημόσιο Ημερολόγιο" #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 +#: kallithea/templates/base/base.html:306 #: kallithea/templates/journal/journal.html:4 #: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Ημερολόγιο" -#: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 msgid "Bad captcha" msgstr "Λάθος captcha" -#: kallithea/controllers/login.py:157 +#: kallithea/controllers/login.py:150 msgid "You have successfully registered into Kallithea" msgstr "Εγγραφήκατε επιτυχώς στο Kallithea" -#: kallithea/controllers/login.py:202 +#: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" msgstr "Στάλθηκε ένας κωδικός επιβεβαίωσης επαναφοράς του συνθηματικού" -#: kallithea/controllers/login.py:251 +#: kallithea/controllers/login.py:244 msgid "Invalid password reset token" msgstr "Άκυρο τεκμήριο (token) επαναφοράς του συνθηματικού" -#: kallithea/controllers/login.py:256 +#: kallithea/controllers/login.py:249 #: kallithea/controllers/admin/my_account.py:167 msgid "Successfully updated password" msgstr "Το συνθηματικό ενημερώθηκε επιτυχώς" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:123 #, python-format msgid "%s (closed)" msgstr "%s (κλειστό)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:151 #: kallithea/templates/changeset/changeset.html:12 #: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Σετ αλλαγών" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:172 msgid "Special" msgstr "Ειδικός" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:173 msgid "Peer branches" msgstr "Ομότιμοι κλάδοι" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 +#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:826 #: kallithea/templates/switch_to_list.html:38 #: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:309 #, python-format msgid "Error creating pull request: %s" msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 +#: kallithea/controllers/pullrequests.py:355 +#: kallithea/controllers/pullrequests.py:502 msgid "No description" msgstr "Χωρίς περιγραφή" -#: kallithea/controllers/pullrequests.py:363 +#: kallithea/controllers/pullrequests.py:362 msgid "Successfully opened new pull request" msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:452 #: kallithea/controllers/pullrequests.py:509 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Καθορίστηκε άκυρος σχολιαστής \"%s\"" -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:368 +#: kallithea/controllers/pullrequests.py:455 msgid "Error occurred while creating pull request" msgstr "Λάθος κατά τη δημιουργία αιτήματος έλξης (pull request)" -#: kallithea/controllers/pullrequests.py:401 +#: kallithea/controllers/pullrequests.py:400 msgid "Missing changesets since the previous pull request:" msgstr "Ελλιπή σετ αλλαγών από την προηγούμενη αίτηση έλξης:" -#: kallithea/controllers/pullrequests.py:408 +#: kallithea/controllers/pullrequests.py:407 #, python-format msgid "New changesets on %s %s since the previous pull request:" msgstr "Καινούρια σετ αλλαγών στα %s %s από την προηγούμενη αίτηση έλξης:" -#: kallithea/controllers/pullrequests.py:415 +#: kallithea/controllers/pullrequests.py:414 msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" -"Το γονικό δεν άλλαξε - εμφάνισε τις διαφορές από την προηγούμενη έκδοση:" - -#: kallithea/controllers/pullrequests.py:422 +msgstr "Το γονικό δεν άλλαξε - εμφάνισε τις διαφορές από την προηγούμενη έκδοση:" + +#: kallithea/controllers/pullrequests.py:421 #, python-format msgid "" "This pull request is based on another %s revision and there is no simple " @@ -396,17 +395,17 @@ "Αυτή η αίτηση έλξης είναι βασισμένη σε μία άλλη %s αναθεώρηση και δεν " "υπάρχει ένα απλό diff." -#: kallithea/controllers/pullrequests.py:424 +#: kallithea/controllers/pullrequests.py:423 #, python-format msgid "No changes found on %s %s since previous version." msgstr "Δεν βρέθηκαν αλλαγές στο %s %s από την προηγούμενη έκδοση." -#: kallithea/controllers/pullrequests.py:462 +#: kallithea/controllers/pullrequests.py:461 #, python-format msgid "Closed, replaced by %s ." msgstr "Κλειστό, αντικαταστάθηκε από %s." -#: kallithea/controllers/pullrequests.py:470 +#: kallithea/controllers/pullrequests.py:469 msgid "Pull request update created" msgstr "Δημιουργήθηκε ενημέρωση αιτήματος έλξης" @@ -429,27 +428,33 @@ #: kallithea/controllers/pullrequests.py:614 #, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "Αυτό το αίτημα έλξης μπορεί να ενημερωθεί με αλλαγές στο %s:" - -#: kallithea/controllers/pullrequests.py:617 +msgid "The following changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:618 msgid "No changesets found for updating this pull request." msgstr "Δεν βρέθηκαν σετ αλλαγών για ενημέρωση αυτού του αιτήματος έλξης." -#: kallithea/controllers/pullrequests.py:625 +#: kallithea/controllers/pullrequests.py:626 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Σημείωση: Ο κλάδος %s έχει άλλη κεφαλή (head): %s." -#: kallithea/controllers/pullrequests.py:631 +#: kallithea/controllers/pullrequests.py:632 msgid "Git pull requests don't support updates yet." msgstr "Αιτήματα έλξης του git δεν υποστηρίζουν ακόμα ενημερώσεις." -#: kallithea/controllers/pullrequests.py:722 +#: kallithea/controllers/pullrequests.py:724 msgid "No permission to change pull request status" msgstr "Χωρίς δικαιώματα αλλαγής της κατάστασης του αιτήματος έλξης" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:735 +#, fuzzy, python-format +#| msgid "Successfully deleted pull request" +msgid "Successfully deleted pull request %s" +msgstr "Επιτυχής διαγραφή αιτήματος έλξης" + +#: kallithea/controllers/pullrequests.py:745 msgid "Closing." msgstr "Κλείνει." @@ -460,150 +465,152 @@ #: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -"Δεν υπάρχει ευρετήριο για την αναζήτηση. Παρακαλώ τρέξτε τον whoosh για την " -"δημιουργία του" +"Δεν υπάρχει ευρετήριο για την αναζήτηση. Παρακαλώ τρέξτε τον whoosh για " +"την δημιουργία του" #: kallithea/controllers/search.py:144 msgid "An error occurred during search operation." -msgstr "" - -#: kallithea/controllers/summary.py:180 +msgstr "Ένα λάθος συνέβη κατά την διαδικασία αναζήτησης." + +#: kallithea/controllers/summary.py:181 #: kallithea/templates/summary/summary.html:384 msgid "No data ready yet" -msgstr "" - -#: kallithea/controllers/summary.py:183 +msgstr "Δεν υπάρχουν ακόμα έτοιμα δεδομένα" + +#: kallithea/controllers/summary.py:184 #: kallithea/templates/summary/summary.html:98 msgid "Statistics are disabled for this repository" -msgstr "" +msgstr "Τα στατιστικά είναι απενεργοποιημένα για αυτό το αποθετήριο" #: kallithea/controllers/admin/auth_settings.py:135 msgid "Auth settings updated successfully" -msgstr "" +msgstr "Οι ρυθμίσεις εξουσιοδότησης ενημερώθηκαν επιτυχώς" #: kallithea/controllers/admin/auth_settings.py:146 msgid "error occurred during update of auth settings" -msgstr "" +msgstr "παρουσιάστηκε βλάβη κατά την ενημέρωση των ρυθμίσεων εξουσιοδότησης" #: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" -msgstr "" +msgstr "Οι προεπιλεγμένες ρυθμίσεις ενημερώθηκαν επιτυχώς" #: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" -msgstr "" +msgstr "Συνέβη μία βλάβη κατά την ενημέρωση των προεπιλογών" + +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:243 +#: kallithea/controllers/admin/users.py:284 +msgid "Forever" +msgstr "Πάντα" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 +#: kallithea/controllers/admin/my_account.py:244 #: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "" +msgid "5 minutes" +msgstr "5 λεπτά" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/my_account.py:245 #: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "" +msgid "1 hour" +msgstr "1 ώρα" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 +#: kallithea/controllers/admin/my_account.py:246 #: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "" +msgid "1 day" +msgstr "1 ημέρα" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/my_account.py:247 #: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 msgid "1 month" -msgstr "" - -#: kallithea/controllers/admin/gists.py:67 +msgstr "1 μήνας" + +#: kallithea/controllers/admin/gists.py:66 #: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/users.py:290 msgid "Lifetime" -msgstr "" - -#: kallithea/controllers/admin/gists.py:146 +msgstr "Διάρκεια ζωής" + +#: kallithea/controllers/admin/gists.py:145 msgid "Error occurred during gist creation" -msgstr "" - -#: kallithea/controllers/admin/gists.py:184 +msgstr "Συνέβη μία βλάβη κατά τη δημιουργία του gist" + +#: kallithea/controllers/admin/gists.py:183 #, python-format msgid "Deleted gist %s" -msgstr "" - -#: kallithea/controllers/admin/gists.py:233 +msgstr "Διαγράφηκε το gist %s" + +#: kallithea/controllers/admin/gists.py:232 msgid "Unmodified" -msgstr "" - -#: kallithea/controllers/admin/gists.py:262 +msgstr "Mη τροποποιημένo" + +#: kallithea/controllers/admin/gists.py:261 msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 +msgstr "Το περιεχόμενο του gist ενημερώθηκε επιτυχώς" + +#: kallithea/controllers/admin/gists.py:266 msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 +msgstr "Τα δεδομένα του gist ενημερώθηκαν επιτυχώς" + +#: kallithea/controllers/admin/gists.py:269 #, python-format msgid "Error occurred during update of gist %s" -msgstr "" +msgstr "Σφάλμα συνέβη κατά την ενημέρωση του gist %s" #: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 #: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" +"Δεν μπορείτε να επεξεργαστείτε αυτόν το χρήστη καθώς είναι κρίσιμος για " +"όλη την εφαρμογή" #: kallithea/controllers/admin/my_account.py:129 msgid "Your account was updated successfully" -msgstr "" +msgstr "Ο λογαριασμός σας ενημερώθηκε επιτυχώς" #: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/users.py:201 #, python-format msgid "Error occurred during update of user %s" -msgstr "" +msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του χρήστη %s" #: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" -msgstr "" +msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του κωδικού του χρήστη" #: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added email %s to user" -msgstr "" +msgstr "Προστέθηκε το email %s στον χρήστη" #: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred during email saving" -msgstr "" +msgstr "Συνέβη ένα σφάλμα κατά την αποθήκευση του email" #: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/users.py:432 msgid "Removed email from user" -msgstr "" +msgstr "Αφαιρέθηκε το email από τον χρήστη" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 +#: kallithea/controllers/admin/users.py:307 msgid "API key successfully created" -msgstr "" +msgstr "Το API κλειδί δημιουργήθηκε επιτυχώς" #: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 +#: kallithea/controllers/admin/users.py:320 msgid "API key successfully reset" -msgstr "" +msgstr "Το API κλειδί επαναφέρθηκε επιτυχώς" #: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:324 msgid "API key successfully deleted" -msgstr "" +msgstr "Το API κλειδί διαγράφηκε επιτυχώς" #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:66 @@ -613,7 +620,7 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" -msgstr "" +msgstr "Ανάγνωση" #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 @@ -623,7 +630,7 @@ #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" -msgstr "" +msgstr "Εγγραφή" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 @@ -651,13 +658,13 @@ #: kallithea/templates/admin/users/user_edit_profile.html:105 #: kallithea/templates/admin/users/users.html:10 #: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:344 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" -msgstr "" +msgstr "Διαχειριστής" #: kallithea/controllers/admin/permissions.py:75 #: kallithea/controllers/admin/permissions.py:86 @@ -667,15 +674,15 @@ #: kallithea/controllers/admin/permissions.py:100 #: kallithea/templates/admin/auth/auth_settings.html:40 msgid "Disabled" -msgstr "" +msgstr "Απενεργοποιημένο" #: kallithea/controllers/admin/permissions.py:77 msgid "Allowed with manual account activation" -msgstr "" +msgstr "Επιτρέπεται με χειροποίητη ενεργοποίηση του λογαριασμού" #: kallithea/controllers/admin/permissions.py:79 msgid "Allowed with automatic account activation" -msgstr "" +msgstr "Επιτρέπεται με αυτόματη ενεργοποίηση του λογαριασμού" #: kallithea/controllers/admin/permissions.py:82 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 @@ -685,9 +692,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1701 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1707 msgid "Manual activation of external account" -msgstr "" +msgstr "Χειροποίητη ενεργοποίηση εξωτερικού λογαριασμού" #: kallithea/controllers/admin/permissions.py:83 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 @@ -697,9 +704,9 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1702 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1708 msgid "Automatic activation of external account" -msgstr "" +msgstr "Αυτόματη ενεργοποίηση εξωτερικού λογαριασμού" #: kallithea/controllers/admin/permissions.py:87 #: kallithea/controllers/admin/permissions.py:90 @@ -708,7 +715,7 @@ #: kallithea/controllers/admin/permissions.py:101 #: kallithea/templates/admin/auth/auth_settings.html:40 msgid "Enabled" -msgstr "" +msgstr "Ενεργό" #: kallithea/controllers/admin/permissions.py:124 msgid "Global permissions updated successfully" @@ -718,242 +725,242 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:187 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:192 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:249 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:283 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:290 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:301 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 +#: kallithea/controllers/admin/repo_groups.py:404 +#: kallithea/controllers/admin/repo_groups.py:439 #: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:419 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 +#: kallithea/controllers/admin/repo_groups.py:456 +#: kallithea/controllers/admin/repos.py:397 #: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:151 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:212 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:221 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:224 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:261 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:312 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:317 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:325 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:373 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 +#: kallithea/controllers/admin/repos.py:429 msgid "An error occurred during creation of field" msgstr "" -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:443 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:459 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:490 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:494 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:512 +#: kallithea/controllers/admin/repos.py:511 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:513 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:520 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:536 +#: kallithea/controllers/admin/repos.py:563 msgid "Repository has been locked" msgstr "" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:539 +#: kallithea/controllers/admin/repos.py:560 msgid "Repository has been unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:542 +#: kallithea/controllers/admin/repos.py:567 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:581 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:585 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:600 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:603 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:636 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:141 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:145 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:277 +#: kallithea/controllers/admin/settings.py:151 +#: kallithea/controllers/admin/settings.py:248 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:216 +#: kallithea/controllers/admin/settings.py:187 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:273 +#: kallithea/controllers/admin/settings.py:244 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:330 +#: kallithea/controllers/admin/settings.py:301 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:335 +#: kallithea/controllers/admin/settings.py:306 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:361 +#: kallithea/controllers/admin/settings.py:332 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:347 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:407 +#: kallithea/controllers/admin/settings.py:378 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:421 +#: kallithea/controllers/admin/settings.py:392 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:425 +#: kallithea/controllers/admin/settings.py:396 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:451 +#: kallithea/controllers/admin/settings.py:422 msgid "Whoosh reindex task scheduled" msgstr "" @@ -994,76 +1001,80 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/users.py:383 msgid "Updated permissions" msgstr "" #: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/users.py:387 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:133 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:148 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:181 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:217 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:222 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:235 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:462 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:468 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:482 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:743 +#: kallithea/lib/auth.py:737 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:756 +#: kallithea/lib/auth.py:750 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:812 +#: kallithea/lib/auth.py:768 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/auth.py:813 msgid "You need to be a registered user to perform this action" msgstr "" -#: kallithea/lib/auth.py:844 +#: kallithea/lib/auth.py:843 msgid "You need to be signed in to view this page" msgstr "" -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:493 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622 +#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:618 msgid "Changeset not found" msgstr "" @@ -1072,237 +1083,237 @@ msgstr "" #: kallithea/lib/diffs.py:82 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:609 +#: kallithea/lib/helpers.py:605 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:611 +#: kallithea/lib/helpers.py:607 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:671 +#: kallithea/lib/helpers.py:667 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:677 +#: kallithea/lib/helpers.py:673 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:696 +#: kallithea/lib/helpers.py:692 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:693 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:694 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:722 +#: kallithea/lib/helpers.py:718 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:742 +#: kallithea/lib/helpers.py:738 #, python-format msgid "Pull request %s" msgstr "" +#: kallithea/lib/helpers.py:748 +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:762 +msgid "[created] repository" +msgstr "" + #: kallithea/lib/helpers.py:752 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:756 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:764 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:756 kallithea/lib/helpers.py:766 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:758 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:760 msgid "[delete] repository" msgstr "" +#: kallithea/lib/helpers.py:768 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:770 +msgid "[updated] user" +msgstr "" + #: kallithea/lib/helpers.py:772 -msgid "[created] user" +msgid "[created] user group" msgstr "" #: kallithea/lib/helpers.py:774 -msgid "[updated] user" +msgid "[updated] user group" msgstr "" #: kallithea/lib/helpers.py:776 -msgid "[created] user group" +msgid "[commented] on revision in repository" msgstr "" #: kallithea/lib/helpers.py:778 -msgid "[updated] user group" +msgid "[commented] on pull request for" msgstr "" #: kallithea/lib/helpers.py:780 -msgid "[commented] on revision in repository" +msgid "[closed] pull request for" msgstr "" #: kallithea/lib/helpers.py:782 -msgid "[commented] on pull request for" +msgid "[pushed] into" msgstr "" #: kallithea/lib/helpers.py:784 -msgid "[closed] pull request for" +msgid "[committed via Kallithea] into repository" msgstr "" #: kallithea/lib/helpers.py:786 -msgid "[pushed] into" +msgid "[pulled from remote] into repository" msgstr "" #: kallithea/lib/helpers.py:788 -msgid "[committed via Kallithea] into repository" +msgid "[pulled] from" msgstr "" #: kallithea/lib/helpers.py:790 -msgid "[pulled from remote] into repository" +msgid "[started following] repository" msgstr "" #: kallithea/lib/helpers.py:792 -msgid "[pulled] from" -msgstr "" - -#: kallithea/lib/helpers.py:794 -msgid "[started following] repository" -msgstr "" - -#: kallithea/lib/helpers.py:796 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:1119 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:1123 +#: kallithea/templates/compare/compare_diff.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:337 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:1189 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:1192 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:1195 msgid "del" msgstr "" +#: kallithea/lib/helpers.py:1198 +msgid "rename" +msgstr "" + #: kallithea/lib/helpers.py:1203 -msgid "rename" -msgstr "" - -#: kallithea/lib/helpers.py:1208 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1444 +#: kallithea/lib/helpers.py:1464 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from the " -"filesystem please run the application again in order to rescan repositories" -msgstr "" - -#: kallithea/lib/utils2.py:415 +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + +#: kallithea/lib/utils2.py:434 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:435 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:436 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:437 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:439 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:455 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:457 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:459 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:462 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:465 msgid "just now" msgstr "" @@ -1401,7 +1412,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1665 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1671 msgid "Kallithea Administrator" msgstr "" @@ -1512,7 +1523,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2229 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2238 msgid "Approved" msgstr "" @@ -1527,7 +1538,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2230 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2239 msgid "Rejected" msgstr "" @@ -1554,7 +1565,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1520 msgid "top level" msgstr "" @@ -1701,7 +1712,7 @@ #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1703 msgid "Registration disabled" msgstr "" @@ -1728,14 +1739,13 @@ msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1697 msgid "Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692 -msgid "" -"Repository creation disabled with write permission to a repository group" +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1698 +msgid "Repository creation disabled with write permission to a repository group" msgstr "" #: kallithea/model/comment.py:72 @@ -1743,103 +1753,103 @@ msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1667 -msgid "Default user has no access to new repositories" -msgstr "" - -#: kallithea/model/db.py:1668 -msgid "Default user has read access to new repositories" -msgstr "" - -#: kallithea/model/db.py:1669 -msgid "Default user has write access to new repositories" -msgstr "" - -#: kallithea/model/db.py:1670 -msgid "Default user has admin access to new repositories" -msgstr "" - -#: kallithea/model/db.py:1672 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1673 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1675 -msgid "Default user has admin access to new repository groups" -msgstr "" - -#: kallithea/model/db.py:1677 -msgid "Default user has no access to new user groups" +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1676 +msgid "Default user has admin access to new repositories" msgstr "" #: kallithea/model/db.py:1678 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1680 -msgid "Default user has admin access to new user groups" -msgstr "" - -#: kallithea/model/db.py:1682 -msgid "Only admins can create repository groups" +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1681 +msgid "Default user has admin access to new repository groups" msgstr "" #: kallithea/model/db.py:1683 -msgid "Non-admins can create repository groups" +msgid "Default user has no access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1684 +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1685 -msgid "Only admins can create user groups" +msgid "Default user has write access to new user groups" msgstr "" #: kallithea/model/db.py:1686 -msgid "Non-admins can create user groups" +msgid "Default user has admin access to new user groups" msgstr "" #: kallithea/model/db.py:1688 -msgid "Only admins can create top level repositories" +msgid "Only admins can create repository groups" msgstr "" #: kallithea/model/db.py:1689 -msgid "Non-admins can create top level repositories" +msgid "Non-admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1691 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1692 +msgid "Non-admins can create user groups" msgstr "" #: kallithea/model/db.py:1694 -msgid "Only admins can fork repositories" +msgid "Only admins can create top level repositories" msgstr "" #: kallithea/model/db.py:1695 -msgid "Non-admins can can fork repositories" -msgstr "" - -#: kallithea/model/db.py:1698 +msgid "Non-admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1700 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1701 +msgid "Non-admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1704 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1705 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2228 +#: kallithea/model/db.py:2237 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2231 +#: kallithea/model/db.py:2240 msgid "Under review" msgstr "" @@ -1861,7 +1871,7 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:165 msgid "Name must not contain only digits" msgstr "" @@ -1963,210 +1973,210 @@ msgstr "" #: kallithea/model/user.py:256 -msgid "" -"You can't remove this user since it is crucial for the entire application" +msgid "You can't remove this user since it is crucial for the entire application" msgstr "" #: kallithea/model/user.py:261 #, python-format msgid "" -"User \"%s\" still owns %s repositories and cannot be removed. Switch owners " -"or remove those repositories: %s" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" msgstr "" #: kallithea/model/user.py:266 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch " -"owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" msgstr "" #: kallithea/model/user.py:273 #, python-format msgid "" -"User \"%s\" still owns %s user groups and cannot be removed. Switch owners " -"or remove those user groups: %s" -msgstr "" - -#: kallithea/model/user.py:360 +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:368 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:418 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:419 #, python-format msgid "" -"The password to your account %s has been changed using password reset form." +"The password to your account %s has been changed using password reset " +"form." msgstr "" #: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:96 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:98 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:100 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:127 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:134 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:154 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - #: kallithea/model/validators.py:155 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:197 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:198 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:200 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:258 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:273 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:289 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:304 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:335 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:351 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:353 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:470 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:471 msgid "" -"Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn" -"+https URL" -msgstr "" - -#: kallithea/model/validators.py:489 +"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " +"svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:496 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:511 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:513 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:563 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:604 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:697 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:714 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:734 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:771 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" -msgstr "" - -#: kallithea/model/validators.py:774 +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:783 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 +#: kallithea/model/validators.py:784 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:817 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:831 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:847 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" @@ -2293,7 +2303,7 @@ #: kallithea/templates/admin/user_groups/user_groups.html:50 #: kallithea/templates/pullrequests/pullrequest_data.html:16 #: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/templates/pullrequests/pullrequest_show.html:244 #: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "" @@ -2341,7 +2351,7 @@ #: kallithea/templates/index_base.html:144 #: kallithea/templates/admin/my_account/my_account_repos.html:61 #: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 +#: kallithea/templates/base/root.html:47 #: kallithea/templates/bookmarks/bookmarks.html:83 #: kallithea/templates/branches/branches.html:83 #: kallithea/templates/journal/journal.html:202 @@ -2351,7 +2361,7 @@ msgstr "" #: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:414 msgid "Log In" msgstr "" @@ -2366,7 +2376,7 @@ #: kallithea/templates/admin/users/user_add.html:32 #: kallithea/templates/admin/users/user_edit_profile.html:24 #: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:390 #: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "" @@ -2374,7 +2384,7 @@ #: kallithea/templates/login.html:33 kallithea/templates/register.html:33 #: kallithea/templates/admin/my_account/my_account.html:37 #: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:399 msgid "Password" msgstr "" @@ -2386,7 +2396,7 @@ msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 msgid "Don't have an account ?" msgstr "" @@ -2425,8 +2435,8 @@ #: kallithea/templates/password_reset.html:47 msgid "" -"A password reset link will be sent to the specified email address if it is " -"registered in the system." +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "" #: kallithea/templates/password_reset_confirmation.html:19 @@ -2436,8 +2446,8 @@ #: kallithea/templates/password_reset_confirmation.html:20 msgid "" -"Note that you must use the same browser session for this as the one used to " -"request the password reset." +"Note that you must use the same browser session for this as the one used " +"to request the password reset." msgstr "" #: kallithea/templates/password_reset_confirmation.html:30 @@ -2507,10 +2517,6 @@ msgid "There are no branches yet" msgstr "" -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - #: kallithea/templates/switch_to_list.html:32 #: kallithea/templates/tags/tags_data.html:44 msgid "There are no tags yet" @@ -2599,8 +2605,8 @@ #: kallithea/templates/admin/auth/auth_settings.html:33 msgid "" -"Comma-separated list of plugins; Kallithea will try user authentication in " -"plugin order" +"Comma-separated list of plugins; Kallithea will try user authentication " +"in plugin order" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:34 @@ -2737,12 +2743,12 @@ msgid "Never" msgstr "" -#: kallithea/templates/admin/gists/edit.html:145 +#: kallithea/templates/admin/gists/edit.html:146 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/changeset/changeset_file_comment.html:105 msgid "Cancel" msgstr "" @@ -2765,7 +2771,7 @@ #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:321 msgid "Create New Gist" msgstr "" @@ -2853,7 +2859,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:36 #: kallithea/templates/admin/users/user_edit_emails.html:19 #: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:95 #: kallithea/templates/data_table/_dt_elements.html:129 #: kallithea/templates/data_table/_dt_elements.html:157 #: kallithea/templates/data_table/_dt_elements.html:173 @@ -2873,8 +2880,6 @@ #: kallithea/templates/base/perms_summary.html:43 #: kallithea/templates/base/perms_summary.html:79 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 #: kallithea/templates/data_table/_dt_elements.html:122 #: kallithea/templates/data_table/_dt_elements.html:123 #: kallithea/templates/data_table/_dt_elements.html:150 @@ -2901,13 +2906,12 @@ msgstr "" #: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:431 msgid "My Account" msgstr "" @@ -3088,7 +3092,7 @@ msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 +#: kallithea/templates/base/base.html:180 msgid "Pull Requests" msgstr "" @@ -3106,7 +3110,7 @@ msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:430 msgid "Notifications" msgstr "" @@ -3133,15 +3137,15 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" -"Allow access to Kallithea without needing to log in. Anonymous users use %s " -"user permissions." +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:25 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will be " -"lost" +"permission, note that all custom default permission on repositories will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 @@ -3183,8 +3187,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "" "All default permissions on each user group will be reset to chosen " -"permission, note that all custom default permission on user groups will be " -"lost" +"permission, note that all custom default permission on user groups will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:54 @@ -3200,8 +3204,7 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "" -"Enable this to allow non-admins to create repositories at the top level." +msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:65 @@ -3217,8 +3220,8 @@ #: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "" "With this, write permission to a repository group allows creating " -"repositories inside that group. Without this, group write permissions mean " -"nothing." +"repositories inside that group. Without this, group write permissions " +"mean nothing." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:79 @@ -3305,7 +3308,7 @@ #: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 #: kallithea/templates/data_table/_dt_elements.html:45 #: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" @@ -3406,8 +3409,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 @@ -3445,15 +3448,14 @@ #: kallithea/templates/admin/repos/repo_add_base.html:22 msgid "" -"Optional: URL of a remote repository. If set, the repository will be created " -"as a clone from this URL." +"Optional: URL of a remote repository. If set, the repository will be " +"created as a clone from this URL." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:32 #: kallithea/templates/admin/repos/repo_edit_settings.html:69 #: kallithea/templates/forks/fork.html:42 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: kallithea/templates/admin/repos/repo_add_base.html:41 @@ -3490,8 +3492,8 @@ #: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format msgid "" -"Repository \"%(repo_name)s\" is being created, you will be redirected when " -"this process is finished.repo_name" +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:39 @@ -3568,6 +3570,11 @@ msgid "Unlock Repository" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "" @@ -3583,9 +3590,9 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:68 msgid "" "Force locking on the repository. Works only when anonymous access is " -"disabled. Triggering a pull locks the repository. The user who is pulling " -"locks the repository; only the user who pulled and locked it can unlock it " -"by doing a push." +"disabled. Triggering a pull locks the repository. The user who is " +"pulling locks the repository; only the user who pulled and locked it can " +"unlock it by doing a push." msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:79 @@ -3615,18 +3622,15 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:90 msgid "" -"The deleted repository will be moved away and hidden until the administrator " -"expires it. The administrator can both permanently delete it or restore it." +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" "Manually invalidate cache for this repository. On first access, the " @@ -3725,10 +3729,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees that " -"this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any other " -"cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees " +"that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any " +"other cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3741,8 +3745,8 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:29 msgid "" -"Optional: URL of a remote repository. If set, the repository can be pulled " -"from this URL." +"Optional: URL of a remote repository. If set, the repository can be " +"pulled from this URL." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:48 @@ -3850,8 +3854,8 @@ #: kallithea/templates/admin/settings/settings_global.html:51 msgid "" -"Private key for reCaptcha system. Setting this value will enable captcha on " -"registration." +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." msgstr "" #: kallithea/templates/admin/settings/settings_global.html:56 @@ -3866,8 +3870,8 @@ #: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" -"Hooks can be used to trigger actions on certain events such as push / pull. " -"They can trigger Python functions or external applications." +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 @@ -3888,8 +3892,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" -"Check this option to remove all comments, pull requests and other records " -"related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records" +" related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3906,8 +3910,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. Current " -"hooks will be updated to the latest version." +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 @@ -3916,9 +3920,9 @@ #: kallithea/templates/admin/settings/settings_mapping.html:30 msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do not " -"seem to come from Kallithea. WARNING: This operation will destroy any custom " -"git hooks you may have deployed by hand!" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:35 @@ -4041,8 +4045,8 @@ #: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting " -"take effect." +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:72 @@ -4080,25 +4084,26 @@ "Gravatar URL allows you to use another avatar server application.\n" " The following " "variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" " {email} user " "email,\n" -" {md5email} md5 hash " -"of the user email (like at gravatar.com),\n" -" {size} size of " -"the image that is expected from the server application,\n" -" {netloc} network " -"location/server host of running Kallithea server" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" +"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" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" " {user} current " "user username,\n" " {netloc} network " @@ -4115,8 +4120,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" -"Number of items displayed in the main page dashboard before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 @@ -4155,8 +4160,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" -"Parses meta tags from the repository description field and turns them into " -"colored tags." +"Parses meta tags from the repository description field and turns them " +"into colored tags." msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:5 @@ -4356,21 +4361,17 @@ msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:144 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 +#: kallithea/templates/base/base.html:152 #: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 +#: kallithea/templates/base/base.html:154 #: kallithea/templates/bookmarks/bookmarks.html:56 #: kallithea/templates/bookmarks/bookmarks_data.html:13 #: kallithea/templates/branches/branches.html:56 @@ -4380,111 +4381,116 @@ msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:331 #: kallithea/templates/search/search.html:14 #: kallithea/templates/search/search.html:54 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:160 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:162 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:170 msgid "Follow" msgstr "" +#: kallithea/templates/base/base.html:171 +msgid "Unfollow" +msgstr "" + #: kallithea/templates/base/base.html:174 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:177 #: kallithea/templates/data_table/_dt_elements.html:37 #: kallithea/templates/data_table/_dt_elements.html:41 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:178 +#: kallithea/templates/base/base.html:175 #: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 +#: kallithea/templates/base/base.html:180 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:193 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:485 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:305 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:312 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:317 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:318 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:322 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:324 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:325 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:330 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:354 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:377 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:384 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 +#: kallithea/templates/base/base.html:407 msgid "Forgot password ?" msgstr "" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:434 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - -#: kallithea/templates/base/base.html:524 +#: kallithea/templates/base/base.html:615 msgid "Keyboard shortcuts" msgstr "" -#: kallithea/templates/base/base.html:533 +#: kallithea/templates/base/base.html:624 msgid "Site-wide shortcuts" msgstr "" @@ -4495,7 +4501,8 @@ #: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" -"Select to inherit global settings, IP whitelist and permissions from the %s." +"Select to inherit global settings, IP whitelist and permissions from the " +"%s." msgstr "" #: kallithea/templates/base/default_perms_box.html:28 @@ -4600,6 +4607,7 @@ #: kallithea/templates/base/root.html:35 #: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/changeset/diff_block.html:21 msgid "Collapse Diff" msgstr "" @@ -4740,6 +4748,8 @@ #: kallithea/templates/changelog/changelog_summary_data.html:60 #: kallithea/templates/changeset/changeset.html:101 #: kallithea/templates/changeset/changeset_range.html:98 +#: kallithea/templates/compare/compare_cs.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:203 #, python-format msgid "Tag %s" msgstr "" @@ -4768,7 +4778,7 @@ #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:47 msgid "Added" msgstr "" @@ -4830,13 +4840,13 @@ msgstr "" #: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:39 #: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 +#: kallithea/templates/changeset/diff_block.html:72 #: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "" @@ -4846,7 +4856,7 @@ msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 +#: kallithea/templates/changeset/diff_block.html:75 #: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "" @@ -4873,8 +4883,8 @@ msgstr "" #: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/compare/compare_diff.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:329 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4882,8 +4892,8 @@ msgstr[1] "" #: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/compare/compare_diff.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:331 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4892,13 +4902,13 @@ #: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/pullrequests/pullrequest_show.html:350 +#: kallithea/templates/pullrequests/pullrequest_show.html:372 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 +#: kallithea/templates/changeset/changeset.html:231 +#: kallithea/templates/changeset/changeset.html:268 msgid "No revisions" msgstr "" @@ -4914,100 +4924,87 @@ msgid "on this changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:31 msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:39 msgid "Status change" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." +msgid "Commenting on line." msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 +msgid "" +"Comments are in plain text. Use @username inside this text to notify " +"another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:67 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:69 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:75 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:88 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Finish pull request" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:91 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:103 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:104 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:112 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:112 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:116 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:128 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:129 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:130 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" @@ -5017,29 +5014,28 @@ msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:54 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:57 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:66 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 +#: kallithea/templates/changeset/diff_block.html:69 #: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:83 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - #: kallithea/templates/compare/compare_cs.html:4 msgid "No changesets" msgstr "" @@ -5060,29 +5056,29 @@ msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:85 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/templates/compare/compare_cs.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:321 msgid "Common ancestor" msgstr "" -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 -msgid "is" -msgstr "" - #: kallithea/templates/compare/compare_cs.html:99 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:107 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:108 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:109 msgid "behind" msgstr "" @@ -5093,28 +5089,28 @@ msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:316 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:84 +#: kallithea/templates/compare/compare_diff.html:93 msgid "Show full diff" msgstr "" @@ -5173,17 +5169,23 @@ msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 -msgid "To set a new password, click the following link" +#: kallithea/templates/email_templates/password_reset.html:8 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." msgstr "" #: kallithea/templates/email_templates/password_reset.html:10 +msgid "To set a new password, click the following link" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:13 msgid "" -"Should you not be able to use the link above, please type the following code " -"into the password reset form" -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:12 +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:16 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." @@ -5266,8 +5268,10 @@ msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "" +#, fuzzy +#| msgid "Unknown archive type" +msgid "New file type" +msgstr "Άγνωστος τύπος αρχειοθέτησης" #: kallithea/templates/files/files_add.html:64 #: kallithea/templates/files/files_delete.html:43 @@ -5397,8 +5401,16 @@ msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +#: kallithea/templates/files/files_source.html:74 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:76 +msgid "Show full annotation anyway." +msgstr "" + +#: kallithea/templates/files/files_source.html:78 +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5645,8 +5657,8 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:124 msgid "" -"This is just a range of changesets and doesn't have a target or a real merge " -"ancestor." +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:133 @@ -5661,39 +5673,47 @@ msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 +#: kallithea/templates/pullrequests/pullrequest_show.html:215 +msgid "" +"Pull requests do not change once created. Select a revision and save to " +"replace this pull request with a new one." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:249 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 -msgid "Type name of reviewer to add" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:258 -msgid "Potential Reviewers" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show.html:261 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:269 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:272 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 +#: kallithea/templates/pullrequests/pullrequest_show.html:295 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "" - #: kallithea/templates/pullrequests/pullrequest_show.html:296 +#, fuzzy +#| msgid "Successfully opened new pull request" +msgid "Save Updates as New Pull Request" +msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" + +#: kallithea/templates/pullrequests/pullrequest_show.html:297 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:307 msgid "Pull Request Content" msgstr "" @@ -5704,7 +5724,7 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, python-format -msgid "Pull Requests from %s'" +msgid "Pull Requests from '%s'" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 @@ -5946,3 +5966,52 @@ #: kallithea/templates/tags/tags.html:26 msgid "Compare Tags" msgstr "" + +#~ msgid "" +#~ "Changing status on a changeset " +#~ "associated with a closed pull request" +#~ " is not allowed" +#~ msgstr "" +#~ "Η αλλαγή της κατάστασης ενός σετ " +#~ "αλλαγών σχετιζόμενων με μια κλειστή " +#~ "αίτηση έλξης(pull request) δεν επιτρέπεται" + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "Αυτό το αίτημα έλξης μπορεί να ενημερωθεί με αλλαγές στο %s:" + +#~ msgid "Non-admins can can fork repositories" +#~ msgstr "" + +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "" + +#~ msgid "Commenting on line {1}." +#~ msgstr "" + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "" + +#~ msgid "Use @username inside this text to notify another user" +#~ msgstr "" + +#~ msgid "Comment preview" +#~ msgstr "" + +#~ msgid "Preview" +#~ msgstr "" + +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "" + +#~ msgid "New file mode" +#~ msgstr "" + +#~ msgid "File is too big to display" +#~ msgstr "" + +#~ msgid "Save as New Pull Request" +#~ msgstr "" + +#~ msgid "Pull Requests from %s'" +#~ msgstr "" +