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

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit fb31f6e6dec0a4fb76ee74df1c0b9b263f8dbfbe Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 12:16:34 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 1c24e10..2285eb8 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "u"> <!ENTITY torbirdy.prefs.timezone.label "No establecer la zona horaria de Thunderbird a UTC [por defecto: establecer a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "n"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Incluír las claves de identificación del receptor en los mensajes cifrados [por defecto: habilitado]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "No ponga la clave de identificación del receptor en los mensajes cifrados [por defecto: poner]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "f"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar el correo si Enigmail está habilitado [predeterminado: no confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 3534799cfb75aa56d8fd96109cb31c3d23109d7d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 12:16:28 2013 +0000 Update translations for torbirdy --- es/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 2777e14..2285eb8 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "u"> <!ENTITY torbirdy.prefs.timezone.label "No establecer la zona horaria de Thunderbird a UTC [por defecto: establecer a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "n"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "No ponga la clave de identificación del receptor en los mensajes cifrados [por defecto: poner]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "f"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar el correo si Enigmail está habilitado [predeterminado: no confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

r26337: {website} add torproject.lu. (website/trunk)
by Andrew Lewman 03 Sep '13

03 Sep '13

Author: phobos Date: 2013-09-03 11:45:29 +0000 (Tue, 03 Sep 2013) New Revision: 26337 Modified: website/trunk/update-mirrors.pl Log: add torproject.lu. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-09-02 13:03:44 UTC (rev 26336) +++ website/trunk/update-mirrors.pl 2013-09-03 11:45:29 UTC (rev 26337) @@ -1252,6 +1252,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "" + }, + mirror101 => { + adminContact => "info /AT\ enn /DOT\ lu", + orgName => "Frenn vun der Enn A.S.B.L.", + isoCC => "IS", + subRegion => "Iceland", + region => "Europe", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://torproject.lu/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://torproject.lu/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "http://btn6gqzqevlhoryd.onion" } );

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 884047923f2e30e42956ea6690ceb7f7a1a4f566 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 09:46:52 2013 +0000 Update translations for torbirdy_completed --- lv/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 12851cf..da0327e 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Neiestatīt Thunderbird'a laika zonu uz UTC [noklusēti: iestatīt uz UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Likt saņēmēju atslēgu identifikatorus kriptētos ziņojumos [noklusēti: nelikt]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Nelikt saņēmēju atslēgu identifikatorus šifrētajos ziņojumos [pēc noklusējuma: likt]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Apstiprināt pirms e-pasta nosūtīšanas, ja iespējota Enigmail [noklusējumvērtība: neapstiprināt]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 5378663066b40fd0e96c2f06d5db4512424c1373 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 09:46:46 2013 +0000 Update translations for torbirdy --- lv/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 80e4b10..da0327e 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Neiestatīt Thunderbird'a laika zonu uz UTC [noklusēti: iestatīt uz UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Nelikt saņēmēju atslēgu identifikatorus šifrētajos ziņojumos [pēc noklusējuma: likt]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Apstiprināt pirms e-pasta nosūtīšanas, ja iespējota Enigmail [noklusējumvērtība: neapstiprināt]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 40591ffcc4d8b427a0a1689ed9d3fedfb751b9d9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 08:47:44 2013 +0000 Update translations for torbirdy_completed --- da/torbirdy.dtd | 2 +- templates/torbirdy.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/da/torbirdy.dtd b/da/torbirdy.dtd index 46a20a8..1302801 100644 --- a/da/torbirdy.dtd +++ b/da/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Sæt ikke Thunderbirds tidszone til UTC [standard: sæt til UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Tilføj modtagernøglernes IDs i krypterede meddelelser [standard: tilføj ikke]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Tilføj ikke modtagerens nøgle-id i de krypterede meddelelser [standard: tilføj]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekræft før afsendelse af e-mail hvis Enigmail er aktiv [standard: bekræft ikke]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index 2d8d268..6fefe12 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -39,7 +39,7 @@ <!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"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Put the recipient key IDs into encrypted messages [default: do not put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 2b74bc8c607ee47a7e9e78866e36f16bcdd31b06 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 08:47:33 2013 +0000 Update translations for torbirdy --- ar/torbirdy.dtd | 2 +- cs/torbirdy.dtd | 2 +- da/torbirdy.dtd | 2 +- de/torbirdy.dtd | 2 +- el/torbirdy.dtd | 2 +- es/torbirdy.dtd | 2 +- eu/torbirdy.dtd | 2 +- fa/torbirdy.dtd | 2 +- fr/torbirdy.dtd | 2 +- gu_IN/torbirdy.dtd | 2 +- he/torbirdy.dtd | 2 +- hi/torbirdy.dtd | 2 +- hu/torbirdy.dtd | 2 +- it/torbirdy.dtd | 2 +- ja/torbirdy.dtd | 2 +- ko/torbirdy.dtd | 2 +- lv/torbirdy.dtd | 2 +- nb/torbirdy.dtd | 2 +- nl/torbirdy.dtd | 2 +- pa/torbirdy.dtd | 2 +- pl/torbirdy.dtd | 2 +- pt/torbirdy.dtd | 2 +- pt_BR/torbirdy.dtd | 2 +- ru/torbirdy.dtd | 2 +- si_LK/torbirdy.dtd | 2 +- sk_SK/torbirdy.dtd | 2 +- sr/torbirdy.dtd | 2 +- sv/torbirdy.dtd | 2 +- templates/torbirdy.dtd | 2 +- tr/torbirdy.dtd | 2 +- zh_CN/torbirdy.dtd | 2 +- zh_TW/torbirdy.dtd | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd index a1d890b..18cf5e1 100644 --- a/ar/torbirdy.dtd +++ b/ar/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "د"> <!ENTITY torbirdy.prefs.timezone.label "لا تقم بضبط المنطقة الزمنية لثندربيرد للتوقيت العالمي UTC [الوضع الافتراضي: قم باستخدام UTC]"> <!ENTITY torbirdy.prefs.timezone.key "ي"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "قم بوضع عناوين مفاتيح المرسل إليهم في رسائل مشفرة [الوضع الافتراضي: لا تضع]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "ه"> <!ENTITY torbirdy.prefs.confirmemail.label "أكد قبل إرسال البريد الإلكتروني إذا تم تمكين Enigmail [الوضع الافتراضي: لا تُأكد]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/cs/torbirdy.dtd b/cs/torbirdy.dtd index f5d8893..0fbfe80 100644 --- a/cs/torbirdy.dtd +++ b/cs/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Nenastavuj časové zóny Thunderbirdu do UTC [defaultně: nastav do UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Vlož klíčové ID příjemce do šifrovaných zpráv [defaultně: nevkládej]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/da/torbirdy.dtd b/da/torbirdy.dtd index 46a20a8..1302801 100644 --- a/da/torbirdy.dtd +++ b/da/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Sæt ikke Thunderbirds tidszone til UTC [standard: sæt til UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Tilføj modtagernøglernes IDs i krypterede meddelelser [standard: tilføj ikke]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Tilføj ikke modtagerens nøgle-id i de krypterede meddelelser [standard: tilføj]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekræft før afsendelse af e-mail hvis Enigmail er aktiv [standard: bekræft ikke]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index a8fa1cb..c7c57c0 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Setzen Sie Thunderbirds Zeitzone nicht auch UTC [standard: auf UTC setzen]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Deaktiviere GPG '--throw-keyids' [default: aktiviert]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Vor dem absenden einer Email überprüfen, ob Enigmail aktiviert ist [standard: nicht überprüfen]"> <!ENTITY torbirdy.prefs.confirmemail.key "b"> diff --git a/el/torbirdy.dtd b/el/torbirdy.dtd index c55f3dc..9ac3ac6 100644 --- a/el/torbirdy.dtd +++ b/el/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Μην ορίσετε τη ζώνη ώρας του Thunderbird σε UTC [προεπιλογή: ορίστηκε σε UTC]"> <!ENTITY torbirdy.prefs.timezone.key "ζ"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Απενεργοποίηση GPG '--throw-keyids' [προεπιλογή: ενεργοποιημένο]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "ρ"> <!ENTITY torbirdy.prefs.confirmemail.label "Επιβεβαιωση πριν την αποστολη του email αν το Enigmail ειναι ενεργοποιημενο [προκαθορισμος: καμμια επιβεβαιωση]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 1c24e10..2777e14 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "u"> <!ENTITY torbirdy.prefs.timezone.label "No establecer la zona horaria de Thunderbird a UTC [por defecto: establecer a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "n"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Incluír las claves de identificación del receptor en los mensajes cifrados [por defecto: habilitado]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "f"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar el correo si Enigmail está habilitado [predeterminado: no confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index 2cd0af5..c97d888 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Thunderbirden denbora gunea UTCra ez ezarri [lehenetsia: UTCra ezarri]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ezgaitu GPG '--throw-keyids' [lehenetsia: gaituta]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Berretsi Enigmail gaituta dagoen eposta bidali baino lehen [lehentsia: es berretsi]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/fa/torbirdy.dtd b/fa/torbirdy.dtd index 4f5fd48..96d53a5 100644 --- a/fa/torbirdy.dtd +++ b/fa/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "ساعت تاندربِرد را به UTC تغییر نده [پیش فرض: تغییر به UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "قابلیت شناسایی کلید در پیغام به رمز شده [پیش فرض: خاموش ]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "تایید قبل از ارسال کردن ایمیل، در صورتی که Enigmail فعال باشد. [ پیشفرض: خاموش] "> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index 093bc93..c358d66 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Ne pas configurer le fuseau horaire de Thunderbird en UTC [par défaut: configurer en UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Désactiver le GPG '--throw-keyids' [default: activé]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!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 "c"> diff --git a/gu_IN/torbirdy.dtd b/gu_IN/torbirdy.dtd index 98c5538..f6ff5bc 100644 --- a/gu_IN/torbirdy.dtd +++ b/gu_IN/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "થન્ડરબર્ડનો સમય વિસ્તાર UTC પર ન ગોઠવો [મૂળભૂત: UTC પર ગોઠવેલ]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "મેળવનારની કી ઓળખ એન્ક્રિપ્ટ કરેલ સંદેશાઓમાં મૂકો [મૂળભૂત: ન મૂકો]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index 89b6154..2f9c0b6 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "אל תקבע את איזור הזמן של Thunderbird לUTC [ברירת מחדל: קבע לUTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "בעת שליחת דואר מוצפן, אל תצרף את זהות המקבל. [ברירת המחדל: מופעל]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "וודא לפני שליחה כאשר אניגמייל מופעל [ברירת מחדל: אל תוודא]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd index 99e148d..1fb02f8 100644 --- a/hi/torbirdy.dtd +++ b/hi/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "P/प"> <!ENTITY torbirdy.prefs.timezone.label "Thunderbird के समय क्षेत्र को UTC के लिए स्थापित मत करना [डिफ़ॉल्ट: UTC के लिए स्थापित करना]"> <!ENTITY torbirdy.prefs.timezone.key ""> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "प्राप्तकर्ता key को इंन्क्रिप्टेड संदेशों में डालो [डिफ़ॉल्ट: मत डालो]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label ""> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd index 56f751e..d19b961 100644 --- a/hu/torbirdy.dtd +++ b/hu/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Ne állítsa be a Thunderbird időzónáját UTC-re [alapértelmezett: beállítás UTC-re]"> <!ENTITY torbirdy.prefs.timezone.key "m"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "A GPG '--throw-keyids' kikapcsolása [alapértelmezett: bekapcsolva]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "a"> <!ENTITY torbirdy.prefs.confirmemail.label "Email küldése előtt rákérdezés, ha Enigmail engedélyezett [alapértelmezés: ne egyen rákérdezés]"> <!ENTITY torbirdy.prefs.confirmemail.key "p"> diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd index fb0e980..65185af 100644 --- a/it/torbirdy.dtd +++ b/it/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Non impostare il fuso orario di Thunderbird a UTC [default: impostato a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Inserisci gli ID delle chiavi del destinatario in messaggi criptati [predefinito: non inserire]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Conferma prima di inviare l'email se Enigmail è attivo [predefinito: non confermare]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/ja/torbirdy.dtd b/ja/torbirdy.dtd index 3df84e7..8b7aa89 100644 --- a/ja/torbirdy.dtd +++ b/ja/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "サンダーバードのタイムゾーンをUTCに設定しない [デフォルト: UTCに設定]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "受領者のキーIDを暗号化したメッセージに付ける[デフォルト：付けない]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Enigmailが有効の場合メールを送信する前に確認 [デフォルト: 確認しない]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd index 3aa252e..ac3cf25 100644 --- a/ko/torbirdy.dtd +++ b/ko/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "썬더버드의 타임존을 UTC로 설정하지 마십시오 [기본값 : UTC로 설정]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "수취인의 키 ID를 암호화된 메시지에 넣기 [기본값 : 비활성화]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Enigmail이 활성화되었을 경우 메일을 보내기 전에 확인하기 [기본값 : 확인하지 않음]"> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 12851cf..80e4b10 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Neiestatīt Thunderbird'a laika zonu uz UTC [noklusēti: iestatīt uz UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Likt saņēmēju atslēgu identifikatorus kriptētos ziņojumos [noklusēti: nelikt]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Apstiprināt pirms e-pasta nosūtīšanas, ja iespējota Enigmail [noklusējumvērtība: neapstiprināt]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd index fe64b20..f08dccc 100644 --- a/nb/torbirdy.dtd +++ b/nb/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Ikke sett Thunderbirds tidssone til UTC [standard: sett til UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Sett mottakernøkkel inn i krypterte meldinger [standard: ikke sett inn] "> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekreft før sending av e-post hvis Enigmail er aktivert [standard: ikke bekreft]"> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index 7821b22..faa8310 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Gebruik niet de UTC tijdzone voor Thunderbird [standaard: gebruik UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Uitschakelen GPG '--throw-keyids' [standaard: ingeschakeld]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Bevestig het versturen van e-mail als Enigmail is ingeschakeld [standaard: bevestig niet]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd index c38b047..61bbb7a 100644 --- a/pa/torbirdy.dtd +++ b/pa/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "ਥੰਡਰਬਰਡ ਦੇ ਟਾਇਮ ਜ਼ੋਨ ਨੂੰ UTC ਨਾ ਤੈਅ ਕਰੋ"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "GPG '--throw-keyids' ਰੱਦ ਕਰੋ"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p"> <!ENTITY torbirdy.prefs.confirmemail.label "ਈਮੇਲ ਕਰਨ ਤੌਂ ਪਿਹਲਾਂ ਪੂਛੋ ਜੈ ਏਨਿਗਮੇਲ ਚਾਲੂ ਹੈ"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd index 862a2a2..abfd2d9 100644 --- a/pl/torbirdy.dtd +++ b/pl/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Nie ustawiaj strefy czasowej Thunderbirda na UTC [domyślne: ustaw na UTC]"> <!ENTITY torbirdy.prefs.timezone.key "s"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Wyłącz GPG '--throw-keyids' [domyślne: włączone]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Potwierdzaj przed wysłaniem wiadomości, gdy Enigmail jest włączony [domyślnie: nie potwierdzaj]"> <!ENTITY torbirdy.prefs.confirmemail.key "i"> diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd index c462ddc..78385a0 100644 --- a/pt/torbirdy.dtd +++ b/pt/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "I"> <!ENTITY torbirdy.prefs.timezone.label "Não defina o fuso horário do Thunderbird como UTC [por defeito: definir como ]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Coloque as chaves dos IDs do destinatário em mensagens encriptadas [por defeito: não colocar]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirme, antes de enviar email, se o Enigmail está ativado [por defeito: não confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index c85f267..9abf3d4 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Não defina o fuso horário do Thunderbird para UTC [padrão: definido para UTC]"> <!ENTITY torbirdy.prefs.timezone.key "f"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Colocar o ID do destinatário em mensagens criptografadas [padrão: não colocar]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar email se Enigmail estiver ativado [padrão: não confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd index 39e5368..638e660 100644 --- a/ru/torbirdy.dtd +++ b/ru/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Не устанавливать часовой пояс Thunderbird по UTC [по умолчанию: по Гринвичу]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Вставьте идентификаторы получателей ключа в зашифрованные сообщения [по умолчанию: не ставьте]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Оповещать об активации Enigmail перед отправкой письма [по умолчанию: не оповещать]"> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/si_LK/torbirdy.dtd b/si_LK/torbirdy.dtd index fc7b058..27ed005 100644 --- a/si_LK/torbirdy.dtd +++ b/si_LK/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "UTC සදහා Thunderbird වේලා කලාපය යෙදීමෙන් වැළකී සිටින්න [default: set to UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "ලබන්නාගේ අනන්‍යතා යතුර සංකේතනය කරන ලද පණිවිඩ වලට යොදන්න [default: do not put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Enigmail සබල කර ඇත්නම් විද්‍යුත් තැපෑල එවීමට පෙර තහවුරු කරන්න [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd index 8013425..667b6de 100644 --- a/sk_SK/torbirdy.dtd +++ b/sk_SK/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Nenastav časovú zónu Thunderbird na UTC [predvolené: nastav na UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Vlož kľúč ID prijímateľa do šifrovanej správy [predvolené: nevlož]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Potvrď či Enigmail je povolený predtým, než odošle email [predvolené: nepotvrď]"> <!ENTITY torbirdy.prefs.confirmemail.key ""> diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd index 056db2f..634f140 100644 --- a/sr/torbirdy.dtd +++ b/sr/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Ne postavljaj UTC kao vremensku zonu za Thunderbird"> <!ENTITY torbirdy.prefs.timezone.key "s"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Искључи GPG '--throw-keyids' [стандардно: укључено]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Potvrdi pre slanja ukoliko je Enigmail omogućen "> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd index 2b322d7..c6de026 100644 --- a/sv/torbirdy.dtd +++ b/sv/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Sätt inte Thunderbirds tidzon till UTC [standard: sätt till UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Lägg till mottagarens nyckel-IDn i krypterade meddelanden [standard: lägg inte till]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekräfta innan e-post skickas om Enigmail är aktiverat [standard: bekräfta inte]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index 2d8d268..6fefe12 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -39,7 +39,7 @@ <!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"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Put the recipient key IDs into encrypted messages [default: do not put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd index a26b36b..aac96af 100644 --- a/tr/torbirdy.dtd +++ b/tr/torbirdy.dtd @@ -40,7 +40,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Thunderbird'ün zaman dilimi olarak UTC'yi ayarlama [varsayılan: UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Alıcı anahtar ID'lerini şifrelenmiş mesajların içine koy [varsayılan: koyma]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p"> <!ENTITY torbirdy.prefs.confirmemail.label "Eğer Enigmail etkin ise email yollamadan önce onayla [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 4e4e796..e5c0d10 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "请勿将 Thunderbird 的时区设置为 UTC [默认：设置为 UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件 [默认：不放入]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，确认 Enigmail 是否已启用 [默认：不确认]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> diff --git a/zh_TW/torbirdy.dtd b/zh_TW/torbirdy.dtd index ba1217d..c38005c 100644 --- a/zh_TW/torbirdy.dtd +++ b/zh_TW/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "I"> <!ENTITY torbirdy.prefs.timezone.label "不要設定Thunderbird的時區為UTC[預設值：設定為UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "將收件人私鑰ID訊息加密[預設值：無加密]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "確認在發送電子郵件之前啟用Enigmail[預設值：不確認]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[arm/master] Removing version.py
by atagar＠torproject.org 03 Sep '13

03 Sep '13

commit 2867c14b4d6fd85b2e864eafa2aa9816ed9c082b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 2 11:40:37 2013 -0700 Removing version.py Now that we can import our __init__.py that's the proper place for our versioning information to live. --- arm/__init__.py | 3 +++ arm/logPanel.py | 4 ++-- arm/popups.py | 4 ++-- arm/starter.py | 4 ++-- arm/version.py | 7 ------- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arm/__init__.py b/arm/__init__.py index 0fe42a0..ec6e69a 100644 --- a/arm/__init__.py +++ b/arm/__init__.py @@ -4,3 +4,6 @@ Scripts involved in validating user input, system state, and initializing arm. __all__ = ["starter", "prereq", "version", "configPanel", "controller", "headerPanel", "logPanel", "popups", "torrcPanel"] +__version__ = '1.4.6_dev' +__release_date__ = 'April 28, 2011' + diff --git a/arm/logPanel.py b/arm/logPanel.py index ad067b9..98843c4 100644 --- a/arm/logPanel.py +++ b/arm/logPanel.py @@ -17,7 +17,7 @@ from stem.response import events from stem.util import conf, log, system import arm.popups -from arm.version import VERSION +from arm import __version__ from arm.util import panel, sysTools, torTools, uiTools TOR_EVENT_TYPES = { @@ -554,7 +554,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): if not os.path.exists(baseDir): os.makedirs(baseDir) self.logFile = open(logPath, "a") - log.notice("arm %s opening log file (%s)" % (VERSION, logPath)) + log.notice("arm %s opening log file (%s)" % (__version__, logPath)) except (IOError, OSError), exc: log.error("Unable to write to log file: %s" % sysTools.getFileErrorMsg(exc)) self.logFile = None diff --git a/arm/popups.py b/arm/popups.py index ce31218..2b40558 100644 --- a/arm/popups.py +++ b/arm/popups.py @@ -4,9 +4,9 @@ Functions for displaying popups in the interface. import curses -import version import arm.controller +from arm import __version__, __release_date__ from arm.util import panel, uiTools def init(height = -1, width = -1, top = 0, left = 0, belowStatic = True): @@ -169,7 +169,7 @@ def showAboutPopup(): popup.win.box() popup.addstr(0, 0, "About:", curses.A_STANDOUT) - popup.addstr(1, 2, "arm, version %s (released %s)" % (version.VERSION, version.LAST_MODIFIED), curses.A_BOLD) + popup.addstr(1, 2, "arm, version %s (released %s)" % (__version__, __release_date__), curses.A_BOLD) popup.addstr(2, 4, "Written by Damian Johnson (atagar(a)torproject.org)") popup.addstr(3, 4, "Project page: www.atagar.com/arm") popup.addstr(5, 2, "Released under the GPL v3 (http://www.gnu.org/licenses/gpl.html)") diff --git a/arm/starter.py b/arm/starter.py index b99ac83..0131e97 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -15,7 +15,6 @@ import locale import logging import platform -import arm.version import arm.controller import arm.logPanel import arm.util.connections @@ -24,6 +23,7 @@ import arm.util.torConfig import arm.util.torTools import arm.util.uiTools +from arm import __version__, __release_date__ from stem.control import Controller import stem.connection @@ -295,7 +295,7 @@ def main(): elif opt in ("-e", "--event"): param["startup.events"] = arg # set event flags elif opt in ("-v", "--version"): - print "arm version %s (released %s)\n" % (version.VERSION, version.LAST_MODIFIED) + print "arm version %s (released %s)\n" % (__version__, __release_date__) sys.exit() elif opt in ("-h", "--help"): print HELP_MSG diff --git a/arm/version.py b/arm/version.py deleted file mode 100644 index bbbd5bb..0000000 --- a/arm/version.py +++ /dev/null @@ -1,7 +0,0 @@ -""" -Provides arm's version and release date. -""" - -VERSION = '1.4.6_dev' -LAST_MODIFIED = "April 28, 2011" -

1 0

[arm/master] Dropping arm.util.system.getProcessName()
by atagar＠torproject.org 03 Sep '13

03 Sep '13

commit 6176b9a87c8a4d8ca3f60f953d2d8ca9e276813f Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 2 13:23:39 2013 -0700 Dropping arm.util.system.getProcessName() Replacing this bit of functionality with a stem function named get_name_by_pid(). Actually, we weren't using this function's caching nor exceptions which was silly. Oh, and the ps command we ran had a bug so it was busted when the process had arguments. Go me. --- arm/controller.py | 8 ++++++-- arm/util/sysTools.py | 50 -------------------------------------------------- 2 files changed, 6 insertions(+), 52 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index 71d6adc..f6a1f6e 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -25,7 +25,7 @@ from stem.control import State, Controller from arm.util import connections, hostnames, panel, sysTools, torConfig, torTools -from stem.util import conf, enum, log +from stem.util import conf, enum, log, system ARM_CONTROLLER = None @@ -546,7 +546,11 @@ def startTorMonitor(startTime): if torPid: # use the tor pid to help narrow connection results - torCmdName = sysTools.getProcessName(torPid, "tor") + torCmdName = system.get_name_by_pid(torPid) + + if torCmdName is None: + torCmdName = "tor" + connections.getResolver(torCmdName, torPid, "tor") else: # constructs singleton resolver and, if tor isn't connected, initizes diff --git a/arm/util/sysTools.py b/arm/util/sysTools.py index af38ced..3763826 100644 --- a/arm/util/sysTools.py +++ b/arm/util/sysTools.py @@ -8,7 +8,6 @@ import threading from stem.util import conf, log, proc, str_tools, system -PROCESS_NAME_CACHE = {} # mapping of pids to their process names RESOURCE_TRACKERS = {} # mapping of pids to their resource tracker instances # Runtimes for system calls, used to estimate cpu usage. Entries are tuples of @@ -61,55 +60,6 @@ def getFileErrorMsg(exc): return excStr -def getProcessName(pid, default = None, cacheFailure = True): - """ - Provides the name associated with the given process id. This isn't available - on all platforms. - - Arguments: - pid - process id for the process being returned - default - result if the process name can't be retrieved (raises an - IOError on failure instead if undefined) - cacheFailure - if the lookup fails and there's a default then caches the - default value to prevent further lookups - """ - - if pid in PROCESS_NAME_CACHE: - return PROCESS_NAME_CACHE[pid] - - processName, raisedExc = "", None - - # fetch it from proc contents if available - if proc.is_available(): - try: - processName = proc.get_stats(pid, proc.Stat.COMMAND)[0] - except IOError, exc: - raisedExc = exc - - # fall back to querying via ps - if not processName: - # the ps call formats results as: - # COMMAND - # tor - psCall = system.call("ps -p %s -o command" % pid) - - if psCall and len(psCall) >= 2 and not " " in psCall[1]: - processName, raisedExc = psCall[1].strip(), None - else: - raisedExc = ValueError("Unexpected output from ps: %s" % psCall) - - if raisedExc: - if default == None: raise raisedExc - else: - if cacheFailure: - PROCESS_NAME_CACHE[pid] = default - - return default - else: - processName = os.path.basename(processName) - PROCESS_NAME_CACHE[pid] = processName - return processName - def getResourceTracker(pid, noSpawn = False): """ Provides a running singleton ResourceTracker instance for the given pid.

1 0

[arm/master] Fixing IndexErrors related to path
by atagar＠torproject.org 03 Sep '13

03 Sep '13

commit f0888ecdb89880ea38f6afe2d210ac34c16844ba Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 2 11:43:50 2013 -0700 Fixing IndexErrors related to path Quick fix for a couple indexing errors that's crashing arm when I first start it up. --- arm/connections/connEntry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/connections/connEntry.py b/arm/connections/connEntry.py index 1760d19..8ade8e5 100644 --- a/arm/connections/connEntry.py +++ b/arm/connections/connEntry.py @@ -421,7 +421,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # mirror). for _, status, _, path in myCircuits: - if path[0] == destFingerprint and (status != "BUILT" or len(path) > 1): + if path and path[0] == destFingerprint and (status != "BUILT" or len(path) > 1): self.cachedType = Category.CIRCUIT # matched a probable guard connection # if we fell through, we can eliminate ourselves as a guard in the future @@ -432,7 +432,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # Checks if we match a built, single hop circuit. for _, status, _, path in myCircuits: - if path[0] == destFingerprint and status == "BUILT" and len(path) == 1: + if path and path[0] == destFingerprint and status == "BUILT" and len(path) == 1: self.cachedType = Category.DIRECTORY # if we fell through, eliminate ourselves as a directory connection

1 0