November 2018 - tor-commits - lists.torproject.org

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 05 Nov '18

05 Nov '18

commit 590d7ee85b604b0787bf6723e95130de46646742 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 09:15:19 2018 +0000 Update translations for bridgedb_completed --- el/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 01f8cda66..12129d50d 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-11-05 08:45+0000\n" +"PO-Revision-Date: 2018-11-05 08:56+0000\n" "Last-Translator: A Papac <ap909219(a)protonmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -123,7 +123,7 @@ msgstr "Βήμα %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Πάρτε τις %s γέφυρες %s" +msgstr "Πάρτε τα %s bridges %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -133,7 +133,7 @@ msgstr "Βήμα %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Τώρα %s προσθέστε τις γέφυρες στον Tor Browser %s" +msgstr "Τώρα %s προσθέστε τα bridges στον Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -237,7 +237,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "Η BridgeDB μπορεί να παρέχει γέφυρες με διάφορους %sτύπους Pluggable Transports%s,\nτα οποία μπορούν να κρύψουν τις συνδέσεις σας στο Tor Network, κάνοντας το\nδυσκολότερο για κάποιον που παρακολουθεί τη κίνηση σας να καταλάβει πως\nχρησιμοποιείτε Tor.\n\n" +msgstr "Η BridgeDB μπορεί να παρέχει bridges με διάφορους %sτύπους Pluggable Transports%s,\nτα οποία μπορούν να κρύψουν τις συνδέσεις σας στο Tor Network, κάνοντάς το\nδυσκολότερο για κάποιον που παρακολουθεί την κίνησή σας να καταλάβει πως\nχρησιμοποιείτε Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -245,7 +245,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Υπάρχουν γέφυρες με διευθύνσεις IPv6, αλλά κάποια Pluggable\nTransports δεν είναι συμβατά με IPv6.\n\n" +msgstr "Υπάρχουν bridges με διευθύνσεις IPv6, αλλά κάποια Pluggable\nTransports δεν είναι συμβατά με IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -272,7 +272,7 @@ msgstr "Οι %s Γέφυρες %s είναι Tor αναμεταδότες που #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για λήψη γεφυρών! " +msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για λήψη bridges! " #: bridgedb/strings.py:108 #, python-format @@ -300,7 +300,7 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Παρακαλώ δώστε μας όσο το δυνατόν περισσότερες πληροφορίες για το \nσφάλμα που συναντήσατε, όπως τη λίστα γεφυρών και τα Pluggable Transports \nπου προσπαθήσατε να χρησιμοποιήσετε, την έκδοση του Tor Browser, \nό,τι μηνύματα έδειξε το Tor κτλ." +msgstr "Παρακαλώ δώστε μας όσο το δυνατόν περισσότερες πληροφορίες για το \nσφάλμα που συναντήσατε, όπως τη λίστα των bridges και τα Pluggable Transports \nπου προσπαθήσατε να χρησιμοποιήσετε, την έκδοση του Tor Browser, \nό,τι μηνύματα έδειξε το Tor κτλ." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" @@ -342,7 +342,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Για να εισάγετε γέφυρες στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." +msgstr "Για να εισάγετε bridges στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 @@ -365,7 +365,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Επιλέξτε \"Ναι\" και μετά πατήστε \"Επόμενο\". Για να ρυθμίσετε τις νέες σας \nγέφυρες, αντιγράψτε τις γραμμές με τις διευθύνσεις των γεφυρών στο κουτί \nκειμένου. Μετά πατήστε \"Σύνδεση\" και πρέπει να είστε εντάξει! Αν \nαντιμετωπίσετε προβλήματα, επιλέξτε το κουμπί \"Βοήθεια\" στις \"Ρυθμίσεις \nδικτύου του Tor\"." +msgstr "Επιλέξτε \"Ναι\" και μετά πατήστε \"Επόμενο\". Για να ρυθμίσετε τα νέα σας \nbridges, αντιγράψτε τις γραμμές με τις διευθύνσεις των bridges στο κουτί \nκειμένου. Μετά πατήστε \"Σύνδεση\" και πρέπει να είστε εντάξει! Αν \nαντιμετωπίσετε προβλήματα, επιλέξτε το κουμπί \"Βοήθεια\" στις \"Ρυθμίσεις \nδικτύου του Tor\"." #: bridgedb/strings.py:167 msgid "Displays this message." @@ -376,7 +376,7 @@ msgstr "Εμφανίζει αυτό το μήνυμα." #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "Αίτηση παλιών καλών γεφυρών." +msgstr "Αίτηση παλιών καλών bridges." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Nov '18

05 Nov '18

commit 45f0fb6b42ffb7e9d1ed7f75a5d8800d5741e18c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 09:15:13 2018 +0000 Update translations for bridgedb --- el/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 01f8cda66..12129d50d 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-11-05 08:45+0000\n" +"PO-Revision-Date: 2018-11-05 08:56+0000\n" "Last-Translator: A Papac <ap909219(a)protonmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -123,7 +123,7 @@ msgstr "Βήμα %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Πάρτε τις %s γέφυρες %s" +msgstr "Πάρτε τα %s bridges %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -133,7 +133,7 @@ msgstr "Βήμα %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Τώρα %s προσθέστε τις γέφυρες στον Tor Browser %s" +msgstr "Τώρα %s προσθέστε τα bridges στον Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -237,7 +237,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "Η BridgeDB μπορεί να παρέχει γέφυρες με διάφορους %sτύπους Pluggable Transports%s,\nτα οποία μπορούν να κρύψουν τις συνδέσεις σας στο Tor Network, κάνοντας το\nδυσκολότερο για κάποιον που παρακολουθεί τη κίνηση σας να καταλάβει πως\nχρησιμοποιείτε Tor.\n\n" +msgstr "Η BridgeDB μπορεί να παρέχει bridges με διάφορους %sτύπους Pluggable Transports%s,\nτα οποία μπορούν να κρύψουν τις συνδέσεις σας στο Tor Network, κάνοντάς το\nδυσκολότερο για κάποιον που παρακολουθεί την κίνησή σας να καταλάβει πως\nχρησιμοποιείτε Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -245,7 +245,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Υπάρχουν γέφυρες με διευθύνσεις IPv6, αλλά κάποια Pluggable\nTransports δεν είναι συμβατά με IPv6.\n\n" +msgstr "Υπάρχουν bridges με διευθύνσεις IPv6, αλλά κάποια Pluggable\nTransports δεν είναι συμβατά με IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -272,7 +272,7 @@ msgstr "Οι %s Γέφυρες %s είναι Tor αναμεταδότες που #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για λήψη γεφυρών! " +msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για λήψη bridges! " #: bridgedb/strings.py:108 #, python-format @@ -300,7 +300,7 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Παρακαλώ δώστε μας όσο το δυνατόν περισσότερες πληροφορίες για το \nσφάλμα που συναντήσατε, όπως τη λίστα γεφυρών και τα Pluggable Transports \nπου προσπαθήσατε να χρησιμοποιήσετε, την έκδοση του Tor Browser, \nό,τι μηνύματα έδειξε το Tor κτλ." +msgstr "Παρακαλώ δώστε μας όσο το δυνατόν περισσότερες πληροφορίες για το \nσφάλμα που συναντήσατε, όπως τη λίστα των bridges και τα Pluggable Transports \nπου προσπαθήσατε να χρησιμοποιήσετε, την έκδοση του Tor Browser, \nό,τι μηνύματα έδειξε το Tor κτλ." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" @@ -342,7 +342,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Για να εισάγετε γέφυρες στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." +msgstr "Για να εισάγετε bridges στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 @@ -365,7 +365,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Επιλέξτε \"Ναι\" και μετά πατήστε \"Επόμενο\". Για να ρυθμίσετε τις νέες σας \nγέφυρες, αντιγράψτε τις γραμμές με τις διευθύνσεις των γεφυρών στο κουτί \nκειμένου. Μετά πατήστε \"Σύνδεση\" και πρέπει να είστε εντάξει! Αν \nαντιμετωπίσετε προβλήματα, επιλέξτε το κουμπί \"Βοήθεια\" στις \"Ρυθμίσεις \nδικτύου του Tor\"." +msgstr "Επιλέξτε \"Ναι\" και μετά πατήστε \"Επόμενο\". Για να ρυθμίσετε τα νέα σας \nbridges, αντιγράψτε τις γραμμές με τις διευθύνσεις των bridges στο κουτί \nκειμένου. Μετά πατήστε \"Σύνδεση\" και πρέπει να είστε εντάξει! Αν \nαντιμετωπίσετε προβλήματα, επιλέξτε το κουμπί \"Βοήθεια\" στις \"Ρυθμίσεις \nδικτύου του Tor\"." #: bridgedb/strings.py:167 msgid "Displays this message." @@ -376,7 +376,7 @@ msgstr "Εμφανίζει αυτό το μήνυμα." #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "Αίτηση παλιών καλών γεφυρών." +msgstr "Αίτηση παλιών καλών bridges." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges."

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 05 Nov '18

05 Nov '18

commit 593b1279972929293197818745719d301122e308 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 08:49:25 2018 +0000 Update translations for support-portal --- contents+el.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+el.po b/contents+el.po index 056094aad..8d4107bc9 100644 --- a/contents+el.po +++ b/contents+el.po @@ -1,16 +1,17 @@ # Translators: # erinm, 2018 -# A Papac <ap909219(a)protonmail.com>, 2018 -# Sofia K., 2018 # ilias_ <teneatis(a)gmail.com>, 2018 +# Sofia K., 2018 # Emma Peel, 2018 +# A Papac <ap909219(a)protonmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Emma Peel, 2018\n" +"PO-Revision-Date: 2018-10-02 22:41+0000\n" +"Last-Translator: A Papac <ap909219(a)protonmail.com>, 2018\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 05 Nov '18

05 Nov '18

commit 5626f7902ae808ff7ff8b57453305278c76ea6c3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 08:45:22 2018 +0000 Update translations for bridgedb_completed --- el/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index c5c9fc854..01f8cda66 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-11-02 10:47+0000\n" -"Last-Translator: Sofia K.\n" +"PO-Revision-Date: 2018-11-05 08:45+0000\n" +"Last-Translator: A Papac <ap909219(a)protonmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +45,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Συγγνώμη! Κάτι πήγε στραβά με το αίτημα σας." +msgstr "Συγγνώμη! Κάτι πήγε στραβά με το αίτημά σας." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -96,7 +96,7 @@ msgstr "Αυτό το QRCode περιέχει τις γραμμές γέφυρα #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Δεν υπάρχουν διαθέσιμες γέφυρες..." +msgstr "Δεν υπάρχουν διαθέσιμα bridges..." #: bridgedb/https/templates/bridges.html:132 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Nov '18

05 Nov '18

commit 4edacd34b0c7e58b2c0984ac963e429089446077 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 08:45:14 2018 +0000 Update translations for bridgedb --- el/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index c5c9fc854..01f8cda66 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-11-02 10:47+0000\n" -"Last-Translator: Sofia K.\n" +"PO-Revision-Date: 2018-11-05 08:45+0000\n" +"Last-Translator: A Papac <ap909219(a)protonmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +45,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Συγγνώμη! Κάτι πήγε στραβά με το αίτημα σας." +msgstr "Συγγνώμη! Κάτι πήγε στραβά με το αίτημά σας." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -96,7 +96,7 @@ msgstr "Αυτό το QRCode περιέχει τις γραμμές γέφυρα #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Δεν υπάρχουν διαθέσιμες γέφυρες..." +msgstr "Δεν υπάρχουν διαθέσιμα bridges..." #: bridgedb/https/templates/bridges.html:132 #, python-format

1 0

[onionoo/master] Update to the GeoLite2 ASN database format.
by karsten＠torproject.org 04 Nov '18

04 Nov '18

commit 54e26d8a4f109196ebbb5849df05e799b98e63ed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 31 09:33:04 2018 +0100 Update to the GeoLite2 ASN database format. Fixes #28254. --- CHANGELOG.md | 3 ++ .../metrics/onionoo/updater/LookupService.java | 51 ++++++++++++---------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7fc775..3b7dd16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 7.?-1.??.? - 2018-1?-?? + * Medium changes + - Update to the GeoLite2 ASN database format. + * Minor changes - Rename root package org.torproject.onionoo to org.torproject.metrics.onionoo. diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index edcb2bd..0967bf2 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -38,7 +38,7 @@ public class LookupService { private File geoLite2CityLocationsEnCsvFile; - private File geoIpAsNum2CsvFile; + private File geoLite2AsnBlocksIpv4CsvFile; private boolean hasAllFiles = false; @@ -62,9 +62,10 @@ public class LookupService { + "geoip/."); return; } - this.geoIpAsNum2CsvFile = new File(this.geoipDir, "GeoIPASNum2.csv"); - if (!this.geoIpAsNum2CsvFile.exists()) { - log.error("No GeoIPASNum2.csv file in geoip/."); + this.geoLite2AsnBlocksIpv4CsvFile = new File(this.geoipDir, + "GeoLite2-ASN-Blocks-IPv4.csv"); + if (!this.geoLite2AsnBlocksIpv4CsvFile.exists()) { + log.error("No GeoLite2-ASN-Blocks-IPv4.csv file in geoip/."); return; } this.hasAllFiles = true; @@ -216,29 +217,37 @@ public class LookupService { } /* Obtain a map from IP address numbers to ASN. */ - Map<Long, String> addressNumberAsn = new HashMap<>(); + Map<Long, String[]> addressNumberAsn = new HashMap<>(); try (BufferedReader br = this.createBufferedReaderFromIso88591File( - this.geoIpAsNum2CsvFile)) { + this.geoLite2AsnBlocksIpv4CsvFile)) { SortedSet<Long> sortedAddressNumbers = new TreeSet<>( addressStringNumbers.values()); long firstAddressNumber = sortedAddressNumbers.first(); String line; - long previousStartIpNum = -1L; + br.readLine(); while ((line = br.readLine()) != null) { String[] parts = line.replaceAll("\"", "").split(",", 3); if (parts.length != 3) { log.error("Illegal line '{}' in {}.", line, - geoIpAsNum2CsvFile.getAbsolutePath()); + this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); return lookupResults; } try { - long startIpNum = Long.parseLong(parts[0]); - if (startIpNum <= previousStartIpNum) { - log.error("Line '{}' not sorted in {}.", line, - geoIpAsNum2CsvFile.getAbsolutePath()); + String[] networkAddressAndMask = parts[0].split("/"); + String startAddressString = networkAddressAndMask[0]; + long startIpNum = this.parseAddressString(startAddressString); + if (startIpNum < 0L) { + log.error("Illegal IP address in '{}' in {}.", line, + this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); + return lookupResults; + } + int networkMaskLength = networkAddressAndMask.length < 2 ? 0 + : Integer.parseInt(networkAddressAndMask[1]); + if (networkMaskLength < 8 || networkMaskLength > 32) { + log.error("Missing or illegal network mask in '{}' in {}.", line, + this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); return lookupResults; } - previousStartIpNum = startIpNum; while (firstAddressNumber < startIpNum && firstAddressNumber != -1L) { sortedAddressNumbers.remove(firstAddressNumber); @@ -248,12 +257,11 @@ public class LookupService { firstAddressNumber = sortedAddressNumbers.first(); } } - long endIpNum = Long.parseLong(parts[1]); + long endIpNum = startIpNum + (1 << (32 - networkMaskLength)) - 1; while (firstAddressNumber <= endIpNum && firstAddressNumber != -1L) { - if (parts[2].startsWith("AS")) { - addressNumberAsn.put(firstAddressNumber, parts[2]); - } + addressNumberAsn.put(firstAddressNumber, + new String[] { "AS" + parts[1], parts[2] }); sortedAddressNumbers.remove(firstAddressNumber); if (sortedAddressNumbers.isEmpty()) { firstAddressNumber = -1L; @@ -266,13 +274,13 @@ public class LookupService { } } catch (NumberFormatException e) { log.error("Number format exception while parsing line '{}' in {}.", - line, geoIpAsNum2CsvFile.getAbsolutePath()); + line, this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); return lookupResults; } } } catch (IOException e) { log.error("I/O exception while reading {}: {}", - geoIpAsNum2CsvFile.getAbsolutePath(), e); + this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath(), e); return lookupResults; } @@ -313,10 +321,9 @@ public class LookupService { lookupResult.setLongitude(latLong[1]); } if (addressNumberAsn.containsKey(addressNumber)) { - String[] parts = addressNumberAsn.get(addressNumber).split(" ", - 2); + String[] parts = addressNumberAsn.get(addressNumber); lookupResult.setAsNumber(parts[0]); - lookupResult.setAsName(parts.length == 2 ? parts[1] : ""); + lookupResult.setAsName(parts[1]); } lookupResults.put(addressString, lookupResult); }

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Nov '18

04 Nov '18

commit 88573848fa36ba93d351e895823295251b95527e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 18:15:41 2018 +0000 Update translations for https_everywhere_completed --- ko/https-everywhere.dtd | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index 59d25e154..657c0a6c0 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -2,27 +2,46 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "웹을 암호화 하세요! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다."> <!ENTITY https-everywhere.about.version "버전"> +<!ENTITY https-everywhere.about.rulesets_version "규칙 버전는 다음에 상응합니다:"> <!ENTITY https-everywhere.about.add_new_rule "새 규칙 추가하기"> <!ENTITY https-everywhere.menu.donate_eff_imperative "EFF에 기부하기"> <!ENTITY https-everywhere.menu.observatory "SSL 관측 환경 설정"> -<!ENTITY https-everywhere.menu.globalEnable "모든곳에서 HTTPS 사용"> +<!ENTITY https-everywhere.menu.globalEnable "모든 곳에서 HTTPS 사용"> <!ENTITY https-everywhere.menu.blockUnencryptedRequests "암호화되지 않은 모든 요청 차단"> <!ENTITY https-everywhere.menu.showCounter "카운터 보기"> <!ENTITY https-everywhere.menu.viewAllRules "모든 규칙 표시"> <!ENTITY https-everywhere.options.generalSettings "일반 설정"> -<!ENTITY https-everywhere.options.importSettings "설정 가져오기"> -<!ENTITY https-everywhere.options.import "가져오기"> -<!ENTITY https-everywhere.options.imported "설정을 가져왔습니다."> +<!ENTITY https-everywhere.options.advancedSettings "고급 설정"> +<!ENTITY https-everywhere.options.updateChannels "업데이트 채널"> +<!ENTITY https-everywhere.options.enableMixedRulesets "내용을 혼성의 규칙이 활성화"> +<!ENTITY https-everywhere.options.showDevtoolsTab "개발자 도구 탭 보기"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "규칙 자동 업데이트"> +<!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere 사용자의 규칙"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere 사이트들이 비활성화"> +<!ENTITY https-everywhere.options.updateChannelsWarning "경고: 업데이트 채널을 추가하면 가해자는 브라우저를 납치할 수도 있습니다. 뭘 하고 있는지 알아야만 이 부분이 편집하십시오!"> +<!ENTITY https-everywhere.options.addUpdateChannel "업데이트 채널 추가"> +<!ENTITY https-everywhere.options.enterUpdateChannelName "업데이트 채널 이름을 입력하세요"> +<!ENTITY https-everywhere.options.delete "삭제"> +<!ENTITY https-everywhere.options.update "업데이트"> +<!ENTITY https-everywhere.options.storedRulesetsVersion "저장된 규칙 버전:"> +<!ENTITY https-everywhere.options.updatesLastChecked "마지막 업데이트 확인 일자:"> +<!ENTITY https-everywhere.options.updatesLastCheckedNever "결단코"> <!ENTITY https-everywhere.prefs.export_settings "설정 내보내기"> <!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "규칙이 기본값으로 초기화됩니다. 계속하시겠습니까?"> + +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere는 사용자가 HTTPS 없는 페이지를 이동하는 것을 깨닫았고 대신에 HTTPS 버전을 전송해 봤습니다. HTTPS 버전이 이용할 수 없습니다. 아마 이 사이트는 HTTPS가 지원하지 않습니다. 그래도 가해자는 HTTPS 버전을 차단하고 있는 것도 가능합니다. 이 페이지의 암호화되지 않은 버전을 보려면 HTTPS Everywhere 확장 기능에서 '암호화되지 않은 모든 요청 차단'이라는 옵션을 비활성화도 가능합니다. 그 옵션을 비활성화하면 이동하는 웹사이트에 브라우저가 네트워크 기반 다운그레이드로 공격이 취약할 수도 있는 것을 의식하십시오."> +<!ENTITY https-everywhere.cancel.he_blocking_network "네트워크 기반 다운그레이드로 공격"> <!ENTITY https-everywhere.chrome.stable_rules "Stable, 안정된 규칙"> <!ENTITY https-everywhere.chrome.stable_rules_description "다음 사이트에 접속시 강제 암호화:"> <!ENTITY https-everywhere.chrome.experimental_rules "실험용 규칙"> <!ENTITY https-everywhere.chrome.experimental_rules_description "경고나 오류를 발생시킬 수 있음. 기본설정은 비활성화."> +<!ENTITY https-everywhere.chrome.disable_on_this_site "이 사이트에서 HTTPS Everywhere 사용 안 하기"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "이 사이트에서 HTTPS Everywhere 사용하기"> <!ENTITY https-everywhere.chrome.add_rule "해당 사이트에 규칙 추가"> <!ENTITY https-everywhere.chrome.add_new_rule "해당 사이트에 새 규칙 추가"> <!ENTITY https-everywhere.chrome.always_https_for_host "해당 호스트는 항상 https 사용">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Nov '18

04 Nov '18

commit 4558bc9bd17ae4ae0c34880cffe10c6de8c9de98 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 18:15:35 2018 +0000 Update translations for https_everywhere --- ko/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index bf3897797..657c0a6c0 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -33,8 +33,8 @@ <!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정"> <!ENTITY https-everywhere.prefs.reset_defaults_message "규칙이 기본값으로 초기화됩니다. 계속하시겠습니까?"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Block all unencrypted requests' option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> -<!ENTITY https-everywhere.cancel.he_blocking_network "network-based downgrade attacks"> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere는 사용자가 HTTPS 없는 페이지를 이동하는 것을 깨닫았고 대신에 HTTPS 버전을 전송해 봤습니다. HTTPS 버전이 이용할 수 없습니다. 아마 이 사이트는 HTTPS가 지원하지 않습니다. 그래도 가해자는 HTTPS 버전을 차단하고 있는 것도 가능합니다. 이 페이지의 암호화되지 않은 버전을 보려면 HTTPS Everywhere 확장 기능에서 '암호화되지 않은 모든 요청 차단'이라는 옵션을 비활성화도 가능합니다. 그 옵션을 비활성화하면 이동하는 웹사이트에 브라우저가 네트워크 기반 다운그레이드로 공격이 취약할 수도 있는 것을 의식하십시오."> +<!ENTITY https-everywhere.cancel.he_blocking_network "네트워크 기반 다운그레이드로 공격"> <!ENTITY https-everywhere.chrome.stable_rules "Stable, 안정된 규칙"> <!ENTITY https-everywhere.chrome.stable_rules_description "다음 사이트에 접속시 강제 암호화:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Nov '18

04 Nov '18

commit db5ad1869790b11be401ce66b173cdf393ae9452 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 17:45:35 2018 +0000 Update translations for https_everywhere --- ko/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index fea7547df..bf3897797 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.options.autoUpdateRulesets "규칙 자동 업데이트"> <!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere 사용자의 규칙"> <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere 사이트들이 비활성화"> -<!ENTITY https-everywhere.options.updateChannelsWarning "Warning: Adding update channels can cause attackers to hijack your browser. Only edit this section if you know what you're doing!"> +<!ENTITY https-everywhere.options.updateChannelsWarning "경고: 업데이트 채널을 추가하면 가해자는 브라우저를 납치할 수도 있습니다. 뭘 하고 있는지 알아야만 이 부분이 편집하십시오!"> <!ENTITY https-everywhere.options.addUpdateChannel "업데이트 채널 추가"> <!ENTITY https-everywhere.options.enterUpdateChannelName "업데이트 채널 이름을 입력하세요"> <!ENTITY https-everywhere.options.delete "삭제">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 04 Nov '18

04 Nov '18

commit 23a7da18325bbdc47f73465a89d1714be57e3378 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 16:46:12 2018 +0000 Update translations for tails-misc_completed --- is.po | 169 +++++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 106 insertions(+), 63 deletions(-) diff --git a/is.po b/is.po index 6eb1ba455..dbc554812 100644 --- a/is.po +++ b/is.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-04 11:37+0200\n" -"PO-Revision-Date: 2018-10-04 08:07+0000\n" +"POT-Creation-Date: 2018-10-31 16:04+0100\n" +"PO-Revision-Date: 2018-11-04 16:22+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgid "" msgstr "Eftirfarandi viðbótarhugbúnaður verður settur upp sjálfvirkt úr varanlegu gagnageymslunni þinni við ræsingu Tails." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132 -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:169 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:172 msgid "" "To add more, install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " @@ -145,136 +145,148 @@ msgstr "Byggingarupplýsingar:\n%s" msgid "not available" msgstr "ekki tiltækt" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:143 +#. Translators: Don't translate {details}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 #, python-brace-format msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." msgstr "{details} Athugaðu listann yfir viðbótarhugbúnaðinn eða lestu kerfisannálana svo þú getir skilið betur hvað er í gangi." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." msgstr "Athugaðu listann yfir viðbótarhugbúnaðinn eða lestu kerfisannálana svo þú getir skilið betur hvað er í gangi." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Show Log" msgstr "Birta atvikaskrá" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Configure" msgstr "Stilla" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:216 +#. Translators: Don't translate {beginning} or {last}, they are +#. placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222 #, python-brace-format msgid "{beginning} and {last}" msgstr "{beginning} og {last}" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:217 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223 msgid ", " msgstr ", " -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:281 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:309 +#. Translators: Don't translate {packages}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 #, python-brace-format msgid "Add {packages} to your additional software?" msgstr "Bæta {packages} í viðbótarhugbúnaðinn þinn?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:283 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291 msgid "" "To install it automatically from your persistent storage when starting " "Tails." msgstr "Til að setja þetta sjálfvirkt upp úr varanlegri gagnageymslu við ræsingu Tails." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293 msgid "Install Every Time" msgstr "Setja upp í hvert skipti" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 msgid "Install Only Once" msgstr "Setja upp aðeins einu sinni" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:355 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 msgid "The configuration of your additional software failed." msgstr "Stillingar á viðbótarhugbúnaðnum þínum mistókst." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:311 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the Additional Software feature." msgstr "Til að setja þetta sjálfvirkt upp við ræsingu Tails, geturðu útbúið úr varanlega gagnageymslu og virkjað eiginleikann Viðbótarhugbúnaður." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 msgid "Create Persistent Storage" msgstr "Útbúa varanlega gagnageymslu" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 msgid "Creating your persistent storage failed." msgstr "Mistókst að útbúa varanlega gagnageymslu." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:329 +#. Translators: Don't translate {packages}, it's a placeholder and +#. will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:341 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" msgstr "Þú getur sett upp {packages} sjálfvirkt við ræsingu Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 msgid "" "To do so, you need to run Tails from a USB stick installed using Tails " "Installer." msgstr "Til að gera þetta, þarftu að keyra Tails af USB-minnislykli sem útbúinn hefur verið með Tails-uppsetningarforritinu." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345 +#. Translators: Don't translate {packages}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359 #, python-brace-format msgid "Remove {packages} from your additional software?" msgstr "Fjarlægja {packages} úr viðbótarhugbúnaðnum þínum?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:347 +#. Translators: Don't translate {packages}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 #, python-brace-format msgid "This will stop installing {packages} automatically." msgstr "Þetta mun hætta að setja upp {packages} sjálfvirkt." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:349 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 msgid "Remove" msgstr "Fjarlægja" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:350 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Hætta við" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:524 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." msgstr "Set sjálfvirkt upp viðbótarhugbúnað úr varanlegri gagnageymslu..." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:526 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." msgstr "Þetta gæti tekið nokkrar mínútur." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:538 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559 msgid "The installation of your additional software failed" msgstr "Uppsetning á viðbótarhugbúnaðnum þínum mistókst" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:553 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574 msgid "Additional software installed successfully" msgstr "Það tókst að setja upp viðbótarhugbúnað" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:573 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594 msgid "The check for upgrades of your additional software failed" msgstr "Athugun á uppfærslum á viðbótarhugbúnaðnum þínum mistókst" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:575 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:583 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." msgstr "Athugaðu nettenginguna þína, endurræstu Tails eða lestu kerfisannálana svo þú getir skilið betur hvað er í gangi." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" msgstr "Uppfærsla á viðbótarhugbúnaðnum þínum mistókst" @@ -282,35 +294,41 @@ msgstr "Uppfærsla á viðbótarhugbúnaðnum þínum mistókst" msgid "Documentation" msgstr "Hjálparskjöl" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:95 +#. Translators: Don't translate {package}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:96 #, python-brace-format msgid "" "Remove {package} from your additional software? This will stop installing " "the package automatically." msgstr "Fjarlægja {package} úr viðbótarhugbúnaðnum þínum? Þá verður hætt setja upp viðbótarhugbúnaðarpakkann sjálfvirkt." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:105 +#. Translators: Don't translate {pkg}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:107 #, python-brace-format msgid "Failed to remove {pkg}" msgstr "Mistókst að fjarlægja {pkg}" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:124 msgid "Failed to read additional software configuration" msgstr "Mistókst að lesa uppsetningu viðbótarhugbúnaðar" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:151 +#. Translators: Don't translate {package}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154 #, python-brace-format msgid "Stop installing {package} automatically" msgstr "Hætta að setja upp {package} sjálfvirkt" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:176 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:179 msgid "" "To do so, install some software using <a href=\"synaptic.desktop\">Synaptic " "Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the " "command line</a>." msgstr "Til að gera þetta, skaltu setja upp einhvern hugbúnað með <a href=\"synaptic.desktop\">Synaptic pakkastjóranum</a> eða með <a href=\"org.gnome.Terminal.desktop\">APT á skipanalínu</a>." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:185 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188 msgid "" "To do so, unlock your persistent storage when starting Tails and install " "some software using <a href=\"synaptic.desktop\">Synaptic Package " @@ -318,20 +336,20 @@ msgid "" "line</a>." msgstr "Til að gera þetta, skaltu aflæsa varanlegu gagnageymslunni þinni þegar Tails ræsist og setja síðan upp einhvern hugbúnað með <a href=\"synaptic.desktop\">Synaptic pakkastjóranum</a> eða með <a href=\"org.gnome.Terminal.desktop\">APT á skipanalínu</a>." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:195 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:198 msgid "" "To do so, create a persistent storage and install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " "href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." msgstr "Til að gera þetta, skaltu útbúa varanlega gagnageymslu og setja síðan upp einhvern hugbúnað með <a href=\"synaptic.desktop\">Synaptic pakkastjóranum</a> eða með <a href=\"org.gnome.Terminal.desktop\">APT á skipanalínu</a>." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:203 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:206 msgid "" "To do so, install Tails on a USB stick using <a href=\"tails-" "installer.desktop\">Tails Installer</a> and create a persistent storage." msgstr "Til að gera þetta, settu Tails upp á USB-minnislykil með <a href=\"tails-installer.desktop\">Tails-uppsetningarforritinu</a> og útbúðu varanlega gagnageymslu." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:250 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:253 msgid "[package not available]" msgstr "[pakki ekki tiltækur]" @@ -531,31 +549,37 @@ msgstr "Enginn DNS-nafnaþjónn fékkst í gegnum DHCP eða var skilgreindur í msgid "Failed to run browser." msgstr "Mistókst að ræsa vafra." -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:56 +#. Translators: Don't translate {volume_label} or {volume_size}, +#. they are placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58 #, python-brace-format msgid "{volume_label} ({volume_size})" msgstr "{volume_label} ({volume_size})" -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:59 +#. Translators: Don't translate {partition_name} or {partition_size}, +#. they are placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63 #, python-brace-format msgid "{partition_name} ({partition_size})" msgstr "{partition_name} ({partition_size})" -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:62 +#. Translators: Don't translate {volume_size}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68 #, python-brace-format msgid "{volume_size} Volume" -msgstr "{volume_size} gagnarými" +msgstr "{volume_size} gagnageymsla" #. Translators: Don't translate {volume_name}, it's a placeholder and #. will be replaced. -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:101 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107 #, python-brace-format msgid "{volume_name} (Read-Only)" msgstr "{volume_name} (skrifvarið)" #. Translators: Don't translate {partition_name} and {container_path}, they #. are placeholders and will be replaced. -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:109 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115 #, python-brace-format msgid "{partition_name} in {container_path}" msgstr "{partition_name} í {container_path}" @@ -564,14 +588,14 @@ msgstr "{partition_name} í {container_path}" #. they are placeholders and will be replaced. You should only have to #. translate #. this string if it makes sense to reverse the order of the placeholders. -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:116 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122 #, python-brace-format msgid "{volume_name} – {path_to_file_container}" msgstr "{volume_name} – {path_to_file_container}" #. Translators: Don't translate {partition_name} and {drive_name}, they #. are placeholders and will be replaced. -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128 #, python-brace-format msgid "{partition_name} on {drive_name}" msgstr "{partition_name} á {drive_name}" @@ -580,11 +604,28 @@ msgstr "{partition_name} á {drive_name}" #. they are placeholders and will be replaced. You should only have to #. translate #. this string if it makes sense to reverse the order of the placeholders. -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:129 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135 #, python-brace-format msgid "{volume_name} – {drive_name}" msgstr "{volume_name} – {drive_name}" +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222 +msgid "Wrong passphrase or parameters" +msgstr "Rangt aðgangsorð eða viðföng" + +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224 +msgid "Error unlocking volume" +msgstr "Villa við að aflæsa gagnageymslu" + +#. Translators: Don't translate {volume_name} or {error_message}, +#. they are placeholder and will be replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228 +#, python-brace-format +msgid "" +"Couldn't unlock volume {volume_name}:\n" +"{error_message}" +msgstr "Gat ekki aflæst gagnageymslu {volume_name}:\n{error_message}" + #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83 msgid "No file containers added" msgstr "Engum skráagámum bætt við" @@ -606,38 +647,40 @@ msgstr "Skráagámurinn %s ætti þegar að vera á listanum." msgid "Container opened read-only" msgstr "Skráagámur var opnaður í lesham" -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:132 +#. Translators: Don't translate {path}, it's a placeholder and will be +#. replaced. +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:133 #, python-brace-format msgid "" "The file container {path} could not be opened with write access. It was opened read-only instead. You will not be able to modify the content of the container.\n" "{error_message}" msgstr "Ekki var hægt að opna skráagáminn {path} með skrifheimildum. Í staðinn var hann opnaður í lesham. Þú munt ekki geta breytt innihaldi skráagámsins.\n{error_message}" -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:137 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138 msgid "Error opening file" msgstr "Villa við að opna skrá" -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:159 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160 msgid "Not a VeraCrypt container" msgstr "Er ekki VeraCrypt skráagámur" -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161 #, python-format msgid "The file %s does not seem to be a VeraCrypt container." msgstr "Skráin %s lítur ekki út fyrir að vera VeraCrypt skráagámur." -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:162 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163 msgid "Failed to add container" msgstr "Tókst ekki að bæta við skráagámi" -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164 #, python-format msgid "" "Could not add file container %s: Timeout while waiting for loop setup.Please" " try using the Disks application instead." msgstr "Gat ekki bætt við skráagámnum %s: Rann út á tíma meðan beðið var eftir uppsetningu á hringbeiningu. Notaðu frekar Diskar forritið." -#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:208 +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209 msgid "Choose File Container" msgstr "Veldu skráagám" @@ -676,7 +719,7 @@ msgstr "Óöruggur netvafri" #: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1 msgid "Unlock VeraCrypt Volumes" -msgstr "Aflæsa VeraCrypt gagnarýmum" +msgstr "Aflæsa VeraCrypt gagnageymslum" #: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2 msgid "Mount VeraCrypt encrypted file containers and devices" @@ -734,11 +777,11 @@ msgstr "Þetta forrit tengist hvorki VeraCrypt verkefninu né IDRIX." #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38 msgid "Lock this volume" -msgstr "Læsa þessu gagnarými" +msgstr "Læsa þessari gagnageymslu" #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:61 msgid "Detach this volume" -msgstr "Aftengja þetta gagnarými" +msgstr "Aftengja þessa gagnageymslu" #: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1 msgid "TrueCrypt/VeraCrypt container"

1 0