February 2013 - tor-commits - lists.torproject.org

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit 7b57459c7a035c6adaf01fda3e8ea568f31bb9ca Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 14:47:07 2013 +0000 Update translations for torbirdy_completed --- templates/torbirdy.dtd | 6 +++++- templates/torbirdy.properties | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index e3c7e38..6e14cd4 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -31,7 +31,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]"> <!ENTITY torbirdy.prefs.imap.key "i"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, will select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, select Local Folders]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.account_specific "Account-Specific"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Choose an account: "> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix"> <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> diff --git a/templates/torbirdy.properties b/templates/torbirdy.properties index 241415d..b18d850 100644 --- a/templates/torbirdy.properties +++ b/templates/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Show this warning next time torbirdy.email.advanced.title=TorBirdy Advanced Settings torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit 20bba768b57c2b7a4ec0b7ea26369336787b6e59 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 14:47:04 2013 +0000 Update translations for torbirdy --- ar/torbirdy.dtd | 4 ++++ ar/torbirdy.properties | 3 +++ cs/torbirdy.dtd | 4 ++++ cs/torbirdy.properties | 3 +++ de/torbirdy.dtd | 4 ++++ de/torbirdy.properties | 3 +++ el/torbirdy.dtd | 4 ++++ el/torbirdy.properties | 3 +++ eo/torbirdy.properties | 3 +++ es/torbirdy.dtd | 4 ++++ es/torbirdy.properties | 3 +++ eu/torbirdy.dtd | 4 ++++ eu/torbirdy.properties | 3 +++ fa/torbirdy.dtd | 4 ++++ fa/torbirdy.properties | 3 +++ fr/torbirdy.dtd | 4 ++++ fr/torbirdy.properties | 3 +++ he/torbirdy.dtd | 4 ++++ he/torbirdy.properties | 3 +++ hu/torbirdy.dtd | 4 ++++ hu/torbirdy.properties | 3 +++ it/torbirdy.dtd | 4 ++++ it/torbirdy.properties | 3 +++ ko/torbirdy.dtd | 4 ++++ ko/torbirdy.properties | 3 +++ lv/torbirdy.dtd | 4 ++++ lv/torbirdy.properties | 3 +++ nl/torbirdy.dtd | 4 ++++ nl/torbirdy.properties | 3 +++ pa/torbirdy.dtd | 4 ++++ pa/torbirdy.properties | 3 +++ pl/torbirdy.dtd | 4 ++++ pl/torbirdy.properties | 3 +++ pt_BR/torbirdy.dtd | 4 ++++ pt_BR/torbirdy.properties | 3 +++ ru/torbirdy.dtd | 4 ++++ ru/torbirdy.properties | 3 +++ sk/torbirdy.properties | 3 +++ sr/torbirdy.dtd | 4 ++++ sr/torbirdy.properties | 3 +++ templates/torbirdy.dtd | 6 +++++- templates/torbirdy.properties | 3 +++ zh_CN/torbirdy.dtd | 4 ++++ zh_CN/torbirdy.properties | 3 +++ 44 files changed, 154 insertions(+), 1 deletions(-) diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd index 7454402..ef5f125 100644 --- a/ar/torbirdy.dtd +++ b/ar/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "مرتبط بالحساب"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "اختر حساباً"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "قم باستخدام جون دو (JonDo) النسخة Premium"> <!ENTITY torbirdy.panel.usewhonix.label "استخدم Whonix"> <!ENTITY torbirdy.panel.preferences.label "افتح مخصصات توربيردي"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/ar/torbirdy.properties b/ar/torbirdy.properties index 04d4df3..745fdd4 100644 --- a/ar/torbirdy.properties +++ b/ar/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=اريني هذا التحذير المرة torbirdy.email.advanced.title=الاعدادات المتقدمة لــتوربيردي torbirdy.restart=لتثبيت اختيار التوقيت, رجاءاً اغلق ثندربيرد و اعد فتح البرنامج من جديد. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/cs/torbirdy.dtd b/cs/torbirdy.dtd index dd3fd15..c252168 100644 --- a/cs/torbirdy.dtd +++ b/cs/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Účet-specifický"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Vyber účet:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Použít JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Použít Whonix"> <!ENTITY torbirdy.panel.preferences.label "Otevřít TorBirdy preference"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/cs/torbirdy.properties b/cs/torbirdy.properties index a97caa1..6c076ad 100644 --- a/cs/torbirdy.properties +++ b/cs/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Zobraz toto upozornění příště torbirdy.email.advanced.title=TorBirdy Pokročilé nastavení torbirdy.restart=Aby se projevily změny nastavení časového pásma, prosím vypněte a znovu zapněte Thunderbird. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 7c10850..f1b16be 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Konten-spezifisch"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Konto auswählen: "> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) nutzen"> <!ENTITY torbirdy.panel.usewhonix.label "Whonix nutzen"> <!ENTITY torbirdy.panel.preferences.label "TorBirdy Einstellungen öffnen"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/de/torbirdy.properties b/de/torbirdy.properties index a381893..a777f1d 100644 --- a/de/torbirdy.properties +++ b/de/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Zeige diese Warnung weiterhin an torbirdy.email.advanced.title=TorBirdy Erweiterte Einstellungen torbirdy.restart=Damit die Änderungen an der Zeitzoneneinstellung wirksam werden, starten Sie bitte Thunderbird neu. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/el/torbirdy.dtd b/el/torbirdy.dtd index f2321cb..fe3ee41 100644 --- a/el/torbirdy.dtd +++ b/el/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Ειδικός λογαριασμός"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Επιλογή ενός λογαριασμού"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label ""> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label ""> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/el/torbirdy.properties b/el/torbirdy.properties index b39303c..a2c12d5 100644 --- a/el/torbirdy.properties +++ b/el/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Δείξε μου αυτή την ειδοπ torbirdy.email.advanced.title=TorBirdy: Ρυθμίσεις για προχωρημένους torbirdy.restart=Για την προτίμηση ζώνης ώρας για να τεθεί σε ισχύ, παρακαλούμε κλείστε τον Thunderbird και ανοίξτετον ξανά. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/eo/torbirdy.properties b/eo/torbirdy.properties index d21cd4a..e0ab005 100644 --- a/eo/torbirdy.properties +++ b/eo/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.disabled=TorBirdy: malŝaltita! # torbirdy.email.advanced.title=TorBirdy Advanced Settings # torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 61b63cc..6a2b57f 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar el correo si Enigmail está habilitado [predeterminado: no confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> <!ENTITY torbirdy.prefs.select_account.key "c"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Usar JonDo (premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Usar Whonix (virtualización)"> <!ENTITY torbirdy.panel.preferences.label "Abrir Preferencias de TorBirdy"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/es/torbirdy.properties b/es/torbirdy.properties index a90285d..11757b8 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Mostrar esta advertencia la próxima vez torbirdy.email.advanced.title=Configuración avanzada de TorBirdy torbirdy.restart=Para que la configuración de zona horaria sea efectiva, cierre Thunderbird e inícielo de nuevo. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index 16037d4..a08bb06 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label "Berretsi Enigmail gaituta dagoen eposta bidali baino lehen [lehentsia: es berretsi]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Kontuaren araberakoa"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Kontu bat aukeratu:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Erabili JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Erabili Whonix"> <!ENTITY torbirdy.panel.preferences.label "Ireki TorBirdy hobespenak"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/eu/torbirdy.properties b/eu/torbirdy.properties index a9c0b32..448c32f 100644 --- a/eu/torbirdy.properties +++ b/eu/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Abisu hau hurrengo aldian erakutsi torbirdy.email.advanced.title=TorBirdy ezarpen aurreratuak torbirdy.restart=Denbora gunearen hobespena efektua izan dezan, itxi ezazu mesedez Thunderbird eta ireki ezazu berriz. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/fa/torbirdy.dtd b/fa/torbirdy.dtd index fb95e17..31148db 100644 --- a/fa/torbirdy.dtd +++ b/fa/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "مخصوص حساب کاربری"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "یک حساب کاربری انتخاب کنید:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "از JonDo استفاده کن (ویژه)"> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label "تنظیمات توربِردی را باز کن"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/fa/torbirdy.properties b/fa/torbirdy.properties index 32960ad..a657f03 100644 --- a/fa/torbirdy.properties +++ b/fa/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.enabled.custom=توربِردی فعال شده: # torbirdy.email.advanced.title=TorBirdy Advanced Settings # torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index 7f0b82f..17a48c6 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmer avant d'envoyer l'e-mail si Enigmail est activé [défaut : ne pas confirmer]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Compte-spécifique"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Choisir un compte: "> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Utiliser JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Utiliser Whonix"> <!ENTITY torbirdy.panel.preferences.label "Ouvrir les préférences de TorBirdy"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/fr/torbirdy.properties b/fr/torbirdy.properties index b2d552f..94f7f66 100644 --- a/fr/torbirdy.properties +++ b/fr/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Afficher cet avertissement la prochaine fois torbirdy.email.advanced.title=Paramètres Avancés de TorBirdy torbirdy.restart=Pour appliquer le fuseau horaire, merci de fermer et redémarrer Thunderbird à nouveau. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index d6a4d3c..19d9335 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "חשבון ספציפי"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "בחר חשבון: "> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "תשתמש ב JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label "פתח עדיפויות TorBirdy"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/he/torbirdy.properties b/he/torbirdy.properties index 486271f..84c85f2 100644 --- a/he/torbirdy.properties +++ b/he/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=הצג אזהרה זו בפעם הבאה torbirdy.email.advanced.title=הגדרות מתקדמות עבור TorBirdy torbirdy.restart=על מנת שהעדפות איזור הזמן יבואו לידי ביטוי, אנא הפעל מחדש את Thunderbird + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd index e7f1752..b6217a2 100644 --- a/hu/torbirdy.dtd +++ b/hu/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Fiók-specifikus"> <!ENTITY torbirdy.prefs.select_account.key "V"> <!ENTITY torbirdy.prefs.select_account.label "Válasszon egy fiókot:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label ""> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label ""> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/hu/torbirdy.properties b/hu/torbirdy.properties index 2fa0cd3..497830e 100644 --- a/hu/torbirdy.properties +++ b/hu/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=A figyelmeztetés mutatása legközelebb is. torbirdy.email.advanced.title=TorBirdy Speciális beállítások # torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd index e316c8c..9be92f8 100644 --- a/it/torbirdy.dtd +++ b/it/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Specifico Account"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Seleziona un account:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Usa JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Usa Whonix"> <!ENTITY torbirdy.panel.preferences.label "Apri le preferenze di TorBirdy"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/it/torbirdy.properties b/it/torbirdy.properties index 34f8f70..68f4ffa 100644 --- a/it/torbirdy.properties +++ b/it/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Mostra questo avviso la prossima volta torbirdy.email.advanced.title=Impostazioni avanzate di Torbirdy torbirdy.restart=Affinché le preferenze sul fuso orario abbiano effetto devi chiudere Thunderbird e riavviarlo. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd index e9ce3c7..fb2fd21 100644 --- a/ko/torbirdy.dtd +++ b/ko/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific ""> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label ""> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label ""> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label ""> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/ko/torbirdy.properties b/ko/torbirdy.properties index 7d64c87..524869a 100644 --- a/ko/torbirdy.properties +++ b/ko/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.enabled.jondo=Torbirdy 활성화 : JonDo # torbirdy.email.advanced.title=TorBirdy Advanced Settings # torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 4f2c7fa..e8d3718 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Kontam-piemītošs"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Izvēlēties kontu:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Lietot JonDo (īpašs)"> <!ENTITY torbirdy.panel.usewhonix.label "Lietot Whonix"> <!ENTITY torbirdy.panel.preferences.label "Atvērt TorBirdy preferences"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/lv/torbirdy.properties b/lv/torbirdy.properties index ab91c4f..85758f5 100644 --- a/lv/torbirdy.properties +++ b/lv/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Nākamreiz rādīt šo brīdinājumu torbirdy.email.advanced.title=TorBirdy Lietpratīgie iestatījumi torbirdy.restart=Lūdzu aizveriet Thunderbird'u un startējiet to vēlreiz, lai laika zonu preferences stātos spēkā. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index 703369c..3b72cb9 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Account-specifiek"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Kies een account: "> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Gebruik JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Gebruik Whonix"> <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy voorkeuren"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/nl/torbirdy.properties b/nl/torbirdy.properties index 7ee64b8..6a9deab 100644 --- a/nl/torbirdy.properties +++ b/nl/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Toon deze waarschuwing ook in de toekomst torbirdy.email.advanced.title=TorBirdy geavanceerde instellingen torbirdy.restart=Om de tijdzone aanpassing door te voeren, sluit Thunderbird en start het opnieuw. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd index 772b20c..5e5c90f 100644 --- a/pa/torbirdy.dtd +++ b/pa/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "ਅਕਾਊਂਟ-ਵਿਸ਼ਿਸ਼ਟ"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "ਅਕਾਊਂਟ ਚੁਣੋ"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "ਜੋਨ ਦੋ ਦੀ ਵਰਤੋ ਕਰੋ (ਪ੍ਰੀਮੀਅਮ)"> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label "ਟੌਰਬਰਡੀ ਸੈਟਿੰਗ"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/pa/torbirdy.properties b/pa/torbirdy.properties index 33dc194..a59ed3d 100644 --- a/pa/torbirdy.properties +++ b/pa/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=ਇਹ ਚੇਤਾਵਨੀ ਫੇਰ ਵ torbirdy.email.advanced.title=ਟੌਰਬਰਡੀ ਤਕਨੀਕੀ ਸੈਟਿੰਗ torbirdy.restart=ਟਾਇਮ ਜ਼ੋਨ ਸੈਟਿੰਗ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ ਥੰਡਰਬਰਡ ਨੂੰ ਰੀਸਟਾਰਟ ਕਰੋ + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd index 527ec06..8bf8bd8 100644 --- a/pl/torbirdy.dtd +++ b/pl/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Specyficzne dla konta"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Wybierz konto:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Używaj JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Użyj Whonix"> <!ENTITY torbirdy.panel.preferences.label "Otwórz Preferencje TorBirdy"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/pl/torbirdy.properties b/pl/torbirdy.properties index 100f42d..23f1fd0 100644 --- a/pl/torbirdy.properties +++ b/pl/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Pokaż to ostrzeżenie następnym razem torbirdy.email.advanced.title=Zaawansowane Ustawienia TorBirdy torbirdy.restart=Aby ustawienie strefy czasowej odniosło skutek, proszę zamknąć Thunderbirda i ponownie go uruchomić. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index c0a775e..0fffa84 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "l"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Configurações da Conta"> <!ENTITY torbirdy.prefs.select_account.key "s"> <!ENTITY torbirdy.prefs.select_account.label "Escolha uma conta:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Usar o JonDo (Usuário Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Usar Whonix"> <!ENTITY torbirdy.panel.preferences.label "Abrir Preferências"> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties index fe5fec9..890887a 100644 --- a/pt_BR/torbirdy.properties +++ b/pt_BR/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy torbirdy.restart=Para que as configurações de fuso-horário tenham efeito, por favor reinicie o Thunderbird. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd index 447bcf4..f828365 100644 --- a/ru/torbirdy.dtd +++ b/ru/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific ""> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Выберите аккаунт:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label ""> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label ""> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/ru/torbirdy.properties b/ru/torbirdy.properties index 94d0025..2005de8 100644 --- a/ru/torbirdy.properties +++ b/ru/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Показывать это предупре torbirdy.email.advanced.title=TorBirdy расширенные настройки torbirdy.restart=Для установки временной зоны нажмите close и запустите ещё раз. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/sk/torbirdy.properties b/sk/torbirdy.properties index 624ad97..0666da4 100644 --- a/sk/torbirdy.properties +++ b/sk/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.disabled=TorBirdy: Zakázaný! # torbirdy.email.advanced.title=TorBirdy Advanced Settings # torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd index 8164d9b..2d96a60 100644 --- a/sr/torbirdy.dtd +++ b/sr/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "Специјално-за налог"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Изабери налог: "> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label ""> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label ""> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/sr/torbirdy.properties b/sr/torbirdy.properties index da00ade..f7e9b06 100644 --- a/sr/torbirdy.properties +++ b/sr/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Покажи ово упозорење пр torbirdy.email.advanced.title=TorBirdy Напредна подешавања torbirdy.restart=Да би подешавање везано за временску зону почело да се примењује, молимо да затворите Thunderbird и да га поново покренте. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index e3c7e38..6e14cd4 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -31,7 +31,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]"> <!ENTITY torbirdy.prefs.imap.key "i"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, will select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, select Local Folders]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.account_specific "Account-Specific"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Choose an account: "> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix"> <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> diff --git a/templates/torbirdy.properties b/templates/torbirdy.properties index 241415d..b18d850 100644 --- a/templates/torbirdy.properties +++ b/templates/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Show this warning next time torbirdy.email.advanced.title=TorBirdy Advanced Settings torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index f13fe1a..0a2d860 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.emailwizard.key ""> <!ENTITY torbirdy.prefs.account_specific "指定帐户"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "选择帐户："> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label ""> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label ""> + +<!ENTITY torbirdy.firstrun.title ""> diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties index 3de064e..cc545da 100644 --- a/zh_CN/torbirdy.properties +++ b/zh_CN/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=下次显示此警告 torbirdy.email.advanced.title=TorBirdy 高级设置 # torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit 1c5cc2c89fa28ca5e4c75fc98008b128933f688d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 12:15:57 2013 +0000 Update translations for liveusb-creator --- en_GB/en_GB.po | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 6ee63da..17a4b8d 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -4,13 +4,14 @@ # # Translators: # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010. +# <jonnydennis10(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-02-15 14:42+0000\n" -"Last-Translator: Tor Project <tor-assistants(a)torproject.org>\n" +"PO-Revision-Date: 2013-02-17 12:08+0000\n" +"Last-Translator: eire123 <jonnydennis10(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -131,7 +132,7 @@ msgstr "" #: ../liveusb/gui.py:197 #, python-format msgid "Device is too small: it must be at least %s MiB." -msgstr "" +msgstr "Device is too small: It must be at least %s MB" #: ../liveusb/dialog.py:157 #, python-format @@ -196,12 +197,12 @@ msgstr "" #: ../liveusb/gui.py:601 msgid "Installation complete!" -msgstr "" +msgstr "Installation complete!" #: ../liveusb/gui.py:276 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "Installation complete! (%s)" #: ../liveusb/gui.py:602 msgid "Installation was completed. Press OK to close this program." @@ -209,7 +210,7 @@ msgstr "" #: ../liveusb/creator.py:913 ../liveusb/creator.py:1237 msgid "Installing bootloader..." -msgstr "" +msgstr "Installing bootloader..." #: ../liveusb/gui.py:281 msgid "LiveUSB creation failed!" @@ -233,7 +234,7 @@ msgstr "" #: ../liveusb/gui.py:663 ../liveusb/gui.py:680 msgid "Next" -msgstr "" +msgstr "Next" #: ../liveusb/gui.py:541 #, python-format @@ -242,7 +243,7 @@ msgstr "" #: ../liveusb/creator.py:824 msgid "No mount points found" -msgstr "" +msgstr "No mount points found" #: ../liveusb/creator.py:422 msgid "Not enough free space on device." @@ -279,7 +280,7 @@ msgstr "" #: ../liveusb/creator.py:498 msgid "Removing existing Live OS" -msgstr "" +msgstr "Remove existing Live OS" #: ../liveusb/creator.py:1110 #, python-format @@ -381,7 +382,7 @@ msgstr "" #: ../liveusb/gui.py:414 msgid "Unable to find any USB drive" -msgstr "" +msgstr "Unable to find any USB drive" #: ../liveusb/creator.py:1198 msgid "Unable to find any removable device" @@ -389,7 +390,7 @@ msgstr "" #: ../liveusb/creator.py:1038 msgid "Unable to find partition" -msgstr "" +msgstr "Unable to find partition" #: ../liveusb/creator.py:1278 msgid ""

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit 35a0980de9c050bb380bd683b44717d9a5e43ae8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 12:15:27 2013 +0000 Update translations for vidalia_help --- sco/index.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sco/index.po b/sco/index.po index df7df0d..54c5118 100644 --- a/sco/index.po +++ b/sco/index.po @@ -1,19 +1,20 @@ # # Translators: +# <jonnydennis10(a)gmail.com>, 2013. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-02-17 12:12+0000\n" +"Last-Translator: eire123 <jonnydennis10(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sco\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/index.html:16 @@ -25,7 +26,7 @@ msgstr "Vidalia Help" msgid "" "Select a help topic from the tree on the left or click on the Search button " "above the list of topics to search through all available help topics." -msgstr "" +msgstr "Chuise a help topic fae the tree oan the caur and click oan the Search button abuin the list o topics to search through aw the appen help topics." #. type: Content of: <html><body><p> #: en/index.html:25

1 0

[stem/master] Dropping the 'path' argument from stem.descriptor.parse_file()
by atagar＠torproject.org 17 Feb '13

17 Feb '13

commit 8cdcb0883f0da8bb492da31cfea7155df5e9efed Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 15 09:38:02 2013 -0800 Dropping the 'path' argument from stem.descriptor.parse_file() File objects have a 'name' attribute that we can use to guess the path. This isn't entirely reliable, but nothing is... http://stackoverflow.com/questions/2458676/absolute-path-of-a-file-object The path argument was only there to support the descriptor reader. Now that parse_file() is something for our users it's nice to get rid of arguments they can't use. --- stem/descriptor/__init__.py | 10 +++++----- stem/descriptor/reader.py | 4 ++-- test/integ/descriptor/networkstatus.py | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 669485c..6e5d68f 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -68,7 +68,7 @@ DocumentHandler = stem.util.enum.UppercaseEnum( ) -def parse_file(descriptor_file, descriptor_type = None, path = None, validate = True, document_handler = DocumentHandler.ENTRIES): +def parse_file(descriptor_file, descriptor_type = None, validate = True, document_handler = DocumentHandler.ENTRIES): """ Simple function to read the descriptor contents from a file, providing an iterator for its :class:`~stem.descriptor.__init__.Descriptor` contents. @@ -120,7 +120,6 @@ def parse_file(descriptor_file, descriptor_type = None, path = None, validate = :param file descriptor_file: opened file with the descriptor contents :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_, this is guessed if not provided - :param str path: absolute path to the file's location on disk :param bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise :param stem.descriptor.__init__.DocumentHandler document_handler: method in @@ -154,7 +153,7 @@ def parse_file(descriptor_file, descriptor_type = None, path = None, validate = if not metrics_header_match: descriptor_file.seek(initial_position) - filename = '<undefined>' if path is None else os.path.basename(path) + filename = '<undefined>' if descriptor_file.name is None else os.path.basename(descriptor_file.name) file_parser = None if descriptor_type is not None: @@ -184,8 +183,8 @@ def parse_file(descriptor_file, descriptor_type = None, path = None, validate = if file_parser: for desc in file_parser(descriptor_file): - if path is not None: - desc._set_path(path) + if descriptor_file.name is not None: + desc._set_path(os.path.abspath(descriptor_file.name)) yield desc @@ -288,6 +287,7 @@ class _UnicodeReader(object): def __init__(self, wrapped_file): self.wrapped_file = wrapped_file + self.name = getattr(wrapped_file, 'name', None) def close(self): return self.wrapped_file.close() diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 21ab049..92adeaf 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -517,7 +517,7 @@ class DescriptorReader(object): self._notify_read_listeners(target) with open(target, 'rb') as target_file: - for desc in stem.descriptor.parse_file(target_file, validate = self._validate, path = target, document_handler = self._document_handler): + for desc in stem.descriptor.parse_file(target_file, validate = self._validate, document_handler = self._document_handler): if self._is_stopped.isSet(): return @@ -545,7 +545,7 @@ class DescriptorReader(object): if tar_entry.isfile(): entry = tar_file.extractfile(tar_entry) - for desc in stem.descriptor.parse_file(entry, validate = self._validate, path = target, document_handler = self._document_handler): + for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler): if self._is_stopped.isSet(): return diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 3f758b4..9f68eba 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -43,7 +43,7 @@ class TestNetworkStatus(unittest.TestCase): count = 0 with open(consensus_path, 'rb') as descriptor_file: - for router in stem.descriptor.parse_file(descriptor_file, "network-status-consensus-3 1.0", path = consensus_path): + for router in stem.descriptor.parse_file(descriptor_file, "network-status-consensus-3 1.0"): count += 1 # We should have constant memory usage. Fail if we're using over 200 MB. @@ -88,7 +88,7 @@ class TestNetworkStatus(unittest.TestCase): count = 0 with open(consensus_path, 'rb') as descriptor_file: - for router in stem.descriptor.parse_file(descriptor_file, "network-status-microdesc-consensus-3 1.0", path = consensus_path): + for router in stem.descriptor.parse_file(descriptor_file, "network-status-microdesc-consensus-3 1.0"): count += 1 if resource.getrusage(resource.RUSAGE_SELF).ru_maxrss > 200000: @@ -118,9 +118,9 @@ class TestNetworkStatus(unittest.TestCase): for specify_type in (True, False): with open(consensus_path, 'rb') as descriptor_file: if specify_type: - descriptors = stem.descriptor.parse_file(descriptor_file, "network-status-consensus-3 1.0", path = consensus_path) + descriptors = stem.descriptor.parse_file(descriptor_file, "network-status-consensus-3 1.0") else: - descriptors = stem.descriptor.parse_file(descriptor_file, path = consensus_path) + descriptors = stem.descriptor.parse_file(descriptor_file) router = next(descriptors) self.assertEquals("sumkledi", router.nickname) @@ -139,7 +139,7 @@ class TestNetworkStatus(unittest.TestCase): consensus_path = get_resource("bridge_network_status") with open(consensus_path, 'rb') as descriptor_file: - router = next(stem.descriptor.parse_file(descriptor_file, path = consensus_path)) + router = next(stem.descriptor.parse_file(descriptor_file)) self.assertEquals("Unnamed", router.nickname) self.assertEquals("0014A2055278DB3EB0E59EA701741416AF185558", router.fingerprint) self.assertEquals("FI74aFuNJZZQrgln0f+OaocMd0M", router.digest) @@ -185,7 +185,7 @@ GM9hAsAMRX9Ogqhq5UjDNqEsvDKuyVeyh7unSZEOip9Zr6K/+7VsVPNb8vfBRBjo cert_path = get_resource("metrics_cert") with open(cert_path) as cert_file: - cert = next(stem.descriptor.parse_file(cert_file, path = cert_path)) + cert = next(stem.descriptor.parse_file(cert_file)) self.assertEquals(3, cert.version) self.assertEquals(None, cert.address) self.assertEquals(None, cert.dir_port) @@ -374,7 +374,7 @@ TpQQk3nNQF8z6UIvdlvP+DnJV4izWVkQEZgUZgIVM0E= vote_path = get_resource("metrics_vote") with open(vote_path, 'rb') as descriptor_file: - descriptors = stem.descriptor.parse_file(descriptor_file, path = vote_path) + descriptors = stem.descriptor.parse_file(descriptor_file) router = next(descriptors) self.assertEquals("sumkledi", router.nickname)

1 0

[stem/master] Treat descriptor archive contents as individual files
by atagar＠torproject.org 17 Feb '13

17 Feb '13

commit 6927e68d80bf78d898afe321a599bf174e116e40 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 16 21:53:24 2013 -0800 Treat descriptor archive contents as individual files When the descriptor reader encountered an archive and read non-descriptor content it stopped reading. This has caused me almost two weeks of headaches in troubleshooting... https://trac.torproject.org/8049 Changing the reader's behaviour to instead handle each file within the archive separately. Thanks to Karsten for catching this! --- stem/descriptor/reader.py | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index b017e06..ffd0289 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -553,19 +553,20 @@ class DescriptorReader(object): archive_path = entry.name entry.name = target - for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler): - if self._is_stopped.isSet(): - return - - desc._set_archive_path(archive_path) - self._unreturned_descriptors.put(desc) - self._iter_notice.set() - - entry.close() - except TypeError, exc: - self._notify_skip_listeners(target, ParsingFailure(exc)) - except ValueError, exc: - self._notify_skip_listeners(target, ParsingFailure(exc)) + try: + for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler): + if self._is_stopped.isSet(): + return + + desc._set_archive_path(archive_path) + self._unreturned_descriptors.put(desc) + self._iter_notice.set() + except TypeError, exc: + self._notify_skip_listeners(target, ParsingFailure(exc)) + except ValueError, exc: + self._notify_skip_listeners(target, ParsingFailure(exc)) + finally: + entry.close() except IOError, exc: self._notify_skip_listeners(target, ReadFailed(exc)) finally:

1 0

[stem/master] Adding get_archive_path() method to descriptors
by atagar＠torproject.org 17 Feb '13

17 Feb '13

commit f83c7efce3380c60c81028802e198791aa30dfbd Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 16 10:53:39 2013 -0800 Adding get_archive_path() method to descriptors We can't use a TarInfo's 'name' attribute for get_path() since that corresponds to its location within the archive. That said, I've often wanted both paths so both fixing get_path() for tarballs and adding a get_archive_path(). --- stem/descriptor/__init__.py | 17 +++++++++++++++++ stem/descriptor/reader.py | 9 +++++++++ test/integ/descriptor/reader.py | 18 ++++++++++++++++++ test/settings.cfg | 2 +- 4 files changed, 45 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 6e5d68f..87872d6 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -9,6 +9,7 @@ Package for parsing and processing descriptor data. Descriptor - Common parent for all descriptor file types. |- get_path - location of the descriptor on disk if it came from a file + |- get_archive_path - location of the descriptor within the archive it came from |- get_unrecognized_lines - unparsed descriptor content +- __str__ - string that the descriptor was made from @@ -250,6 +251,7 @@ class Descriptor(object): def __init__(self, contents): self._path = None + self._archive_path = None self._raw_contents = contents def get_path(self): @@ -261,6 +263,18 @@ class Descriptor(object): return self._path + def get_archive_path(self): + """ + If this descriptor came from an archive then provides its path within the + archive. This is only set if the descriptor came from a + :class:`~stem.descriptor.reader.DescriptorReader`, and is **None** if this + descriptor didn't come from an archive. + + :returns: **str** with the descriptor's path within the archive + """ + + return self._archive_path + def get_unrecognized_lines(self): """ Provides a list of lines that were either ignored or had data that we did @@ -275,6 +289,9 @@ class Descriptor(object): def _set_path(self, path): self._path = path + def _set_archive_path(self, path): + self._archive_path = path + def __str__(self): return self._raw_contents diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 92adeaf..b017e06 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -545,10 +545,19 @@ class DescriptorReader(object): if tar_entry.isfile(): entry = tar_file.extractfile(tar_entry) + # The parse_file() function uses the 'name' attribute to figure out + # the file that it came from. In the case of TarInfo instances the + # 'name' is the path within the archive. We'll want that for + # _set_archive_path(). + + archive_path = entry.name + entry.name = target + for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler): if self._is_stopped.isSet(): return + desc._set_archive_path(archive_path) self._unreturned_descriptors.put(desc) self._iter_notice.set() diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 936cf39..3ed47ae 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -266,6 +266,24 @@ class TestDescriptorReader(unittest.TestCase): with reader: self.assertEqual(0, len(list(reader))) + def test_archived_paths(self): + """ + Checks the get_path() and get_archive_path() for a tarball. + """ + + expected_archive_paths = ( + "descriptor_archive/0/2/02c311d3d789f3f55c0880b5c85f3c196343552c", + "descriptor_archive/1/b/1bb798cae15e21479db0bc700767eee4733e9d4a", + "descriptor_archive/1/b/1ef75fef564180d8b3f72c6f8635ff0cd855f92c", + ) + + test_path = os.path.join(DESCRIPTOR_TEST_DATA, "descriptor_archive.tar") + + with stem.descriptor.reader.DescriptorReader(test_path) as reader: + for desc in reader: + self.assertEqual(test_path, desc.get_path()) + self.assertTrue(desc.get_archive_path() in expected_archive_paths) + def test_archived_uncompressed(self): """ Checks that we can read descriptors from an uncompressed archive. diff --git a/test/settings.cfg b/test/settings.cfg index a5abc91..b467fd4 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -157,7 +157,7 @@ target.torrc RUN_PTRACE => PORT, PTRACE pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused -pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 54 +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 55 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes' from line 54 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode' from line 60 pyflakes.ignore test/mocking.py => undefined name 'builtins'

1 0

r26057: {website} Adding Sukhbir to the people page (website/trunk/about/en)
by Damian Johnson 17 Feb '13

17 Feb '13

Author: atagar Date: 2013-02-17 05:34:03 +0000 (Sun, 17 Feb 2013) New Revision: 26057 Modified: website/trunk/about/en/corepeople.wml Log: Adding Sukhbir to the people page Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2013-02-14 03:25:53 UTC (rev 26056) +++ website/trunk/about/en/corepeople.wml 2013-02-17 05:34:03 UTC (rev 26057) @@ -165,6 +165,8 @@ href="http://chillingeffects.org/">ChillingEffects.org</a>.</dd> <dt>Andrea Shepard, Developer</dt> <dd>Works with Nick as a core Tor developer.</dd> + <dt>Sukhbir Singh, Developer</dt> + <dd>Develops and maintains TorBirdy (Torbutton for Thunderbird).</dd> <dt>Dr. Paul Syverson, Researcher</dt> <dd>Inventor of <a href="http://www.onion-router.net/">Onion Routing</a>, original designer of Tor along with Roger and

1 0

[flashproxy/master] Don't show specific error messages when proxying fails.
by dcf＠torproject.org 17 Feb '13

17 Feb '13

commit 90d54824b7b0ba5b7c52e0dc934a8e5c6ae8bbb6 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Feb 3 17:35:36 2013 -0800 Don't show specific error messages when proxying fails. The error messages contain the IP address of a proxy or client. I don't know how to prevent the lower-level error messages from including the IP address, so just omit the whole message. The error messages look like error copying WebSocket to ORPort: read tcp X.X.X.X:YYYY: connection reset by peer error copying WebSocket to ORPort: read tcp X.X.X.X:YYYY: use of closed network connection The great majority of them are "use of closed network connection", which may be a bug related to the sharing of streams in different goroutines. Here are the frequencies of different errors: 1 connection timed out 19 connection reset by peer 1137 use of closed network connection --- websocket-transport/websocket-server.go | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index 6ce9e54..56c4b5b 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -126,7 +126,7 @@ func proxy(local *net.TCPConn, conn *websocketConn) { go func() { _, err := io.Copy(conn, local) if err != nil { - Log("error copying ORPort to WebSocket: " + err.Error()) + Log("error copying ORPort to WebSocket") } local.CloseRead() conn.Close() @@ -136,7 +136,7 @@ func proxy(local *net.TCPConn, conn *websocketConn) { go func() { _, err := io.Copy(local, conn) if err != nil { - Log("error copying WebSocket to ORPort: " + err.Error()) + Log("error copying WebSocket to ORPort") } local.CloseWrite() conn.Close()

1 0

[flashproxy/master] Factor out build_query_string.
by dcf＠torproject.org 17 Feb '13

17 Feb '13

commit 7ec7275f700f1a955bda23c3d54a145b4e9feca7 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Feb 5 15:30:40 2013 -0800 Factor out build_query_string. --- proxy/flashproxy.js | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 8cf086f..c4ffad3 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -175,6 +175,15 @@ function parse_query_string(qs) { return result; } +/* params is a list of (key, value) 2-tuples. */ +function build_query_string(params) { + var parts = []; + for (var i = 0; i < params.length; i++) { + parts.push(encodeURIComponent(params[i][0]) + "=" + encodeURIComponent(params[i][1])); + } + return parts.join("&"); +} + var DEFAULT_PORTS = { http: 80, https: 443 @@ -218,11 +227,7 @@ function build_url(scheme, host, port, path, params) { if (params !== undefined) { parts.push("?"); - for (var i = 0; i < params.length; i++) { - if (i > 0) - parts.push("&"); - parts.push(encodeURIComponent(params[i][0]) + "=" + encodeURIComponent(params[i][1])); - } + parts.push(build_query_string(params)); } return parts.join("");

1 0