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

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

22 Sep '13

commit 3de7e4f668125359d73d428a12d2be7606487da1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 22 13:16:05 2013 +0000 Update translations for torbirdy_completed --- de/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 3436c70..65a7049 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Push E-Mail Support für IMAP-Konten aktivieren [default: deaktiviert]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Beim Start zum zuletzt aktiven Mail-Ordner wechseln [default: Lokale Ordner wird gewählt]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Beim Start zum zuletzt aktiven Mail-Ordner wechseln [default: deaktiviert]"> <!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">

1 0

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

22 Sep '13

commit dbc12d3329c28b8a34762e55c7800e1b77e61fb6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 22 13:16:01 2013 +0000 Update translations for torbirdy --- de/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 1252fd1..65a7049 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Push E-Mail Support für IMAP-Konten aktivieren [default: deaktiviert]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.label "Beim Start zum zuletzt aktiven Mail-Ordner wechseln [default: deaktiviert]"> <!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">

1 0

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

22 Sep '13

commit a3714b70764247f00c0d385f4e4380941f833fa8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 22 12:46:04 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 7350c39..a10c318 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Habilitar soporte de push email para cuentas IMAP [por defecto: deshabilitado]"> <!ENTITY torbirdy.prefs.imap.key "h"> -<!ENTITY torbirdy.prefs.startup_folder.label "Seleccionar la última carpeta de correo utilizado al iniciar [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> +<!ENTITY torbirdy.prefs.startup_folder.label "En el arranque seleccionar la última carpeta de correo a la que se accedió [predeterminado: deshabilitado]"> <!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">

1 0

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

22 Sep '13

commit e23a89ca2d4111f90d431102725980e202ea552d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 22 12:45:59 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 d1d2422..a10c318 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Habilitar soporte de push email para cuentas IMAP [por defecto: deshabilitado]"> <!ENTITY torbirdy.prefs.imap.key "h"> -<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.label "En el arranque seleccionar la última carpeta de correo a la que se accedió [predeterminado: deshabilitado]"> <!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">

1 0

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

22 Sep '13

commit 1e1d45c3f9b589a324aa4e4e09ffce9e44f12ed4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 22 08:47:25 2013 +0000 Update translations for torbirdy_completed --- templates/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index de5ecf9..3e22539 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -35,7 +35,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 "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> <!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">

1 0

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

22 Sep '13

commit 411b2c5602a40a14765dd4cf1098011bd3cc504d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 22 08:47:19 2013 +0000 Update translations for torbirdy --- ar/torbirdy.dtd | 2 +- bs/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 +- hr_HR/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 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd index 1bf4e2a..e3f9ddd 100644 --- a/ar/torbirdy.dtd +++ b/ar/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "عام"> <!ENTITY torbirdy.prefs.imap.label "فعِّل دعم إرسال البريد بنظام IMAP [الوضع الافتراضي: معطل]"> <!ENTITY torbirdy.prefs.imap.key "ذ"> -<!ENTITY torbirdy.prefs.startup_folder.label "حدد آخر مجلد بريدي مستخدم عند بدء التشغيل [الوضع الافتراضي: معطل، اختار الملفات المحليه]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "د"> <!ENTITY torbirdy.prefs.timezone.label "لا تقم بضبط المنطقة الزمنية لثندربيرد للتوقيت العالمي UTC [الوضع الافتراضي: قم باستخدام UTC]"> <!ENTITY torbirdy.prefs.timezone.key "ي"> diff --git a/bs/torbirdy.dtd b/bs/torbirdy.dtd index 06bad8f..325fbc7 100644 --- a/bs/torbirdy.dtd +++ b/bs/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globalno"> <!ENTITY torbirdy.prefs.imap.label "Omogući push e-mail podrške za IMAP račune [default: isključen]"> <!ENTITY torbirdy.prefs.imap.key "P"> -<!ENTITY torbirdy.prefs.startup_folder.label "Odaberite posljednji pristupljen e-mail folder na startup [default: isključen, odaberite Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "P"> <!ENTITY torbirdy.prefs.timezone.label "Nemojte postavljati Thunderbird u vremensku zonu UTC [default: postavljen na UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/cs/torbirdy.dtd b/cs/torbirdy.dtd index c408130..939a30e 100644 --- a/cs/torbirdy.dtd +++ b/cs/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globální"> <!ENTITY torbirdy.prefs.imap.label "Zapnout podporu služby push pro IMAP mailové účty [defaultně: vypnuto]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Vyber naposled použitou mailovou složku při startu [defaultně: vypnuto, vybere Lokální složky]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/da/torbirdy.dtd b/da/torbirdy.dtd index f510992..61d872c 100644 --- a/da/torbirdy.dtd +++ b/da/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Understøt push e-mail for IMAP konti [standard: slået fra]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Vælg sidst anvendte e-mail mappe ved opstart [standard: ikke aktiv, vælg Lokale mapper]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 3436c70..1252fd1 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Push E-Mail Support für IMAP-Konten aktivieren [default: deaktiviert]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Beim Start zum zuletzt aktiven Mail-Ordner wechseln [default: Lokale Ordner wird gewählt]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/el/torbirdy.dtd b/el/torbirdy.dtd index 0538402..5d9b128 100644 --- a/el/torbirdy.dtd +++ b/el/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Παγκόσμια"> <!ENTITY torbirdy.prefs.imap.label "Ενεργοποίηση push email για υποστήριξη IMAP λογαριασμών [προεπιλογή: απενεργοποιημένο]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Επιλογή τελευταίου προσβάσιμου φακέλου e-mail κατά την εκκίνηση [προεπιλογή: απενεργοποιημένο, θα επιλεγούν τοπικοί φάκελοι]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Μην ορίσετε τη ζώνη ώρας του Thunderbird σε UTC [προεπιλογή: ορίστηκε σε UTC]"> <!ENTITY torbirdy.prefs.timezone.key "ζ"> diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 7350c39..d1d2422 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Habilitar soporte de push email para cuentas IMAP [por defecto: deshabilitado]"> <!ENTITY torbirdy.prefs.imap.key "h"> -<!ENTITY torbirdy.prefs.startup_folder.label "Seleccionar la última carpeta de correo utilizado al iniciar [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index d451f19..e5b2cc8 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Orokorra"> <!ENTITY torbirdy.prefs.imap.label "IMAP kontuentzako eposta bultzaketa gaitu [lehenetsia: ezgaitua]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Abioan azkenengoz erabilitako karpeta aukeratu [lehenetsia: ezgaituta, karpeta lokalak aukeratuko dira]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/fa/torbirdy.dtd b/fa/torbirdy.dtd index 5c5cff6..1597ef6 100644 --- a/fa/torbirdy.dtd +++ b/fa/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "جهانی"> <!ENTITY torbirdy.prefs.imap.label "قابلیت شناسایی کلید در پیغام به رمز شده [پیش فرض: خاموش ]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "هنگام آغاز، آخرین پوشه‌ی استفاده شده را انتخاب کن [پیش فرض: غیرفعال، پوشه های محلی را انتخاب کن]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "ساعت تاندربِرد را به UTC تغییر نده [پیش فرض: تغییر به UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index d5f538f..c9eeb73 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Activer la gestion du mail « push » pour les comptes IMAP [défaut : désactivé]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Sélectionner comme dossier d'accueil le dernier dossier e-mail utilisé [défaut : désactivé, les Dossiers Locaux seront sélectionnés]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Ne pas paramétrer le fuseau horaire de Thunderbird à UTC (temps universel) [défaut : configurer en UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/gu_IN/torbirdy.dtd b/gu_IN/torbirdy.dtd index 1ce2bb4..a80ac14 100644 --- a/gu_IN/torbirdy.dtd +++ b/gu_IN/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "વૈશ્વિક"> <!ENTITY torbirdy.prefs.imap.label "IMAP ખાતાંઓ માટે પુશ ઇમેલ આધાર સક્રિય કરો [મૂળભૂત: નિષ્ક્રિય]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "શરુઆત પર છેલ્લો વાપરેલ ઇમેલ પસંદ કરો [મૂળભૂત: નિષ્ક્રિય, સ્થાનિક ફોલ્ડરો પસંદ કરશે]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "થન્ડરબર્ડનો સમય વિસ્તાર UTC પર ન ગોઠવો [મૂળભૂત: UTC પર ગોઠવેલ]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index cf17b48..f51c498 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "גלובאלי"> <!ENTITY torbirdy.prefs.imap.label "אפשר תמיכה בדחיפת דואר על ידי השרת לחשבונות מסוג IMAP [ברירת מחדל: מנוטרל]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "בעת הפעלה, בחר בתיקיית הדואר שנפתחה אחרונה [ברירת מחדל: מנוטרל]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "אל תקבע את איזור הזמן של Thunderbird לUTC [ברירת מחדל: קבע לUTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd index dd4f85f..2f11435 100644 --- a/hr_HR/torbirdy.dtd +++ b/hr_HR/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globalno"> <!ENTITY torbirdy.prefs.imap.label "Omogući push e-mail podrške za IMAP račune [default: isključen]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Odaberite posljednji pristupljen e-mail folder na startup [default: isključen, odaberite Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "I"> <!ENTITY torbirdy.prefs.timezone.label "Nemojte postavljati Thunderbird u vremensku zonu UTC [default: postavljen na UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd index 7fada3b..ec3dfac 100644 --- a/hu/torbirdy.dtd +++ b/hu/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globális"> <!ENTITY torbirdy.prefs.imap.label "A push támogatás bekapcsolása az IMAP fiókokhoz [alapértelmezett: kikapcsolva]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "A legutolsó mail mappa használata indításkor (alapértelmezett: kikapcoslva, csak a helyi mappákat válassza ki)"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd index 509bf47..a708637 100644 --- a/it/torbirdy.dtd +++ b/it/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globale"> <!ENTITY torbirdy.prefs.imap.label "Abilita supporto push email per gli account IMAP [default: disabilitato]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Seleziona l'ultima casella di posta all'avvio [default: disabilitato, verrà selezionato Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/ja/torbirdy.dtd b/ja/torbirdy.dtd index 6da9a62..645ce2c 100644 --- a/ja/torbirdy.dtd +++ b/ja/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "グローバル"> <!ENTITY torbirdy.prefs.imap.label "IMAPアカウントのプッシュメールサポートを有効に[デフォルト：無効]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "起動時に最後にアクセスしたメールフォルダを選択 [デフォルト: 無効、ローカルのフォルダを選択]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "サンダーバードのタイムゾーンをUTCに設定しない [デフォルト: UTCに設定]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd index c2bbc3a..e57c1f6 100644 --- a/ko/torbirdy.dtd +++ b/ko/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "글로벌"> <!ENTITY torbirdy.prefs.imap.label "IMAP 계정에 대한 푸시 이메일 지원 활성화 [기본값:비활성화]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "시작시에 지난번에 접근한 메일 폴더 선택 [기본값 : 비활성화, 로컬 폴더 사용]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "썬더버드의 타임존을 UTC로 설정하지 마십시오 [기본값 : UTC로 설정]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 7aa0eb3..886b638 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globāls"> <!ENTITY torbirdy.prefs.imap.label "IMAP kontiem [noklusēti: atspējots] iespējot e-pastu pašpiegādes atbalstu"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Sākot darbu, izvēlēties pēdējo apmeklēto pasta mapi [noklusēti: atspējots, izvēlēsies Vietējās mapes]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd index 11e3566..0c82ad4 100644 --- a/nb/torbirdy.dtd +++ b/nb/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Aktiver støtte for push e-post til IMAP-kontoer [standard: deaktivert]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Velg sist brukte e-postmappe ved oppstart [standard: deaktivert, velger Lokale Mapper]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index 350820d..d4cf01a 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globaal"> <!ENTITY torbirdy.prefs.imap.label "Ondersteuning voor push e-mail voor IMAP-accounts inschakelen [standaard: uitgeschakeld]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Bij opstarten direct naar de laatst bekeken map gaan [standaard: uitgeschakeld, lokale map wordt geselecteerd]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd index e4fa0cb..773d2a0 100644 --- a/pa/torbirdy.dtd +++ b/pa/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "ਗਲੋਬਲ"> <!ENTITY torbirdy.prefs.imap.label "IMAP ਅਕਾਊਂਟ ਵਾਸਤੇ ਪੁਸ਼ ਈਮੇਲ ਚਾਲੂ ਕਰੋ"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "ਸ਼ੁਰੂ ਹੋਣ ਤੇ ਆਖਰੀ ਈਮੇਲ ਫੋਲਡਰ ਚੋਣਵਾਂ ਕਰੋ"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "ਥੰਡਰਬਰਡ ਦੇ ਟਾਇਮ ਜ਼ੋਨ ਨੂੰ UTC ਨਾ ਤੈਅ ਕਰੋ"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd index 9bc38bd..da5a5df 100644 --- a/pl/torbirdy.dtd +++ b/pl/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globalne"> <!ENTITY torbirdy.prefs.imap.label "Włącz obsługę push email dla kont IMAP [domyślne: wyłączone]"> <!ENTITY torbirdy.prefs.imap.key "P"> -<!ENTITY torbirdy.prefs.startup_folder.label "Przejdź do ostatniego folderu pocztowego przy uruchomieniu [domyślne: wyłączone, wybierze Foldery Lokalne]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd index 083a6d1..f1e976b 100644 --- a/pt/torbirdy.dtd +++ b/pt/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Ative o suporte para push de email de contas IMAP [por defeito: desativado]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Selecione a última pasta de email acedida, ao iniciar [por defeito: desativado, escolha Pastas Locais]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index f1b565d..01b9670 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Geral"> <!ENTITY torbirdy.prefs.imap.label "Ativar suporte a download de emails via IMAP [padrão: desativado]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Abrir a última pasta acessada ao iniciar [padrão: desativado, será selecionada a Pasta Local]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd index 6db0e3a..e21b41e 100644 --- a/ru/torbirdy.dtd +++ b/ru/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Глобальные"> <!ENTITY torbirdy.prefs.imap.label "Активировать принудительную поддержку по электронной почте IMAP аккаунтов [по умолчанию: отключено]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Выбор последнего обращения к почтовой папке при запуске [по умолчанию: отключено, будет выбирать Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Не устанавливать часовой пояс Thunderbird по UTC [по умолчанию: по Гринвичу]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/si_LK/torbirdy.dtd b/si_LK/torbirdy.dtd index 0793313..aae3005 100644 --- a/si_LK/torbirdy.dtd +++ b/si_LK/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "ගෝලීය "> <!ENTITY torbirdy.prefs.imap.label "IMAP ගිණුම් සදහා විද්‍යුත් තැපෑල තල්ලු ආධාරය සබල කරන්න[default: disabled]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "ඇරඹුමේදී අවසන් වරට පිවිසුණු ලිපි ෆෝල්ඩරය තෝරන්න [default: disabled, select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "UTC සදහා Thunderbird වේලා කලාපය යෙදීමෙන් වැළකී සිටින්න [default: set to UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd index 9f26641..b09faf7 100644 --- a/sk_SK/torbirdy.dtd +++ b/sk_SK/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globálne"> <!ENTITY torbirdy.prefs.imap.label "Povoľ podporu push email pre IMAP účty [predvolené: vypnuté]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Pri štarte otvor zložku s posledným prístupom [predvolené: vypnuté, otvor Lokálnu zložku]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd index 3bbaeaf..56030de 100644 --- a/sr/torbirdy.dtd +++ b/sr/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globalno"> <!ENTITY torbirdy.prefs.imap.label "Укључите просљеђивање порука према вашем IMAP налогу [стандардно: искључено]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Селектуј последњу фасциклу којој је приступљено након покретања [стандардно: искључено, биће селектован локални фолдер]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd index 6311771..ccc9e88 100644 --- a/sv/torbirdy.dtd +++ b/sv/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Aktivera push e-post-stöd för IMAP-konton [standard: inaktiverat]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Gå till den senast använda e-post-mappen vid start [standard: inaktiverat, välj Lokala Mappar]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index de5ecf9..3e22539 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -35,7 +35,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 "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> <!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"> diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd index 8b30cd7..cb44652 100644 --- a/tr/torbirdy.dtd +++ b/tr/torbirdy.dtd @@ -36,7 +36,7 @@ <!ENTITY torbirdy.prefs.global "Küresel"> <!ENTITY torbirdy.prefs.imap.label "IMAP hesapları için Push E-mail teknolojisini aktifleştir [varsayılan: pasif]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Başlangıçta, son erişilen posta klasörünü seç [varsayılan: pasif, yerel klasörleri seç]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!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"> diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 2e3dbbd..8387265 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "全球"> <!ENTITY torbirdy.prefs.imap.label "启用 IMAP 帐户邮件推送支持 [默认：禁用]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "启动时选择最后访问的邮件文件夹 [默认：禁用，选择本地文件夹]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "请勿将 Thunderbird 的时区设置为 UTC [默认：设置为 UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> diff --git a/zh_TW/torbirdy.dtd b/zh_TW/torbirdy.dtd index 1bd2df3..059dc92 100644 --- a/zh_TW/torbirdy.dtd +++ b/zh_TW/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "全球"> <!ENTITY torbirdy.prefs.imap.label "啟用郵件發送支援IMAP帳戶[預設值：停用]"> <!ENTITY torbirdy.prefs.imap.key "P"> -<!ENTITY torbirdy.prefs.startup_folder.label "啟動時選擇上次最後存取的郵件資料夾[預設值：停用並選擇本地資料夾]"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key "I"> <!ENTITY torbirdy.prefs.timezone.label "不要設定Thunderbird的時區為UTC[預設值：設定為UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z">

1 0

[torbirdy/master] Update the ChangeLog
by sukhbir＠torproject.org 22 Sep '13

22 Sep '13

commit 85affade44dd65d6c45708e613bf3263b2cf4216 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Sep 22 00:18:14 2013 -0400 Update the ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 240dd53..9f92895 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ toggle checking of new messages automatically for all accounts The minimum version of Thunderbird we now support is 10.0 `--throw-keyids' is now disabled by default + We are no longer forcing Thunderbird updates (closes #8341) Add support for Thunderbird 24 (Gecko 17+) Add Persian translation (thanks to Nima) Add Czech translation (thanks to dope)

1 0

[torbirdy/master] Don't force updates and update LICENSE file
by sukhbir＠torproject.org 22 Sep '13

22 Sep '13

commit 44567dbb5ad598f6766aee6c530f15bf92c5e358 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Sep 22 00:13:51 2013 -0400 Don't force updates and update LICENSE file --- LICENSE | 3 ++- components/torbirdy.js | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index f67a4e6..b6be8c1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Copyright (c) 2012, Jacob Appelbaum <jacob(a)torproject.org> +Copyright (c) 2012-2013, Jacob Appelbaum <jacob(a)torproject.org> +Copyright (c) 2012-2013, Sukhbir Singh <sukhbir(a)torproject.org> All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/components/torbirdy.js b/components/torbirdy.js index 5b976f6..f0ba477 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -216,9 +216,6 @@ const TorBirdyPrefs = { // Override the user agent by setting it to an empty string. "general.useragent.override": "", - // Make sure Thunderbird updates are enabled. - "app.update.enabled": true, - // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5,

1 0

[arm/master] Narrowing scope of start_arm()
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit 6d262f4653a0705ed898c31a48ecbe044c325ddc Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 17:22:46 2013 -0700 Narrowing scope of start_arm() Rearranging things a bit so start_arm() now only concerns connection resolution and starting curses. We had a pretty bad regression where most of this connection related code actually wasn't getting executed at all - oops. --- arm/controller.py | 15 +++------------ arm/starter.py | 8 ++++++++ arm/util/connections.py | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index 68b9146..3623a2f 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -524,10 +524,11 @@ def start_arm(start_time): if controller.get_conf("DisableDebuggerAttachment", None) == "1": log.notice("Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") connections.getResolver("tor").setPaused(True) - + else: # Configures connection resoultions. This is paused/unpaused according to # if Tor's connected or not. - torTools.getConn().addStatusListener(connResetListener) + + controller.add_status_listener(connResetListener) tor_pid = controller.get_pid(None) @@ -544,16 +545,6 @@ def start_arm(start_time): # it to be paused connections.getResolver("tor").setPaused(not controller.is_alive()) - # hack to display a better (arm specific) notice if all resolvers fail - connections.RESOLVER_FINAL_FAILURE_MSG = "We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, \"sudo -u <tor user> arm\")." - - # provides a notice about any event types tor supports but arm doesn't - missing_event_types = arm.logPanel.getMissingEventTypes() - - if missing_event_types: - plural_label = "s" if len(missing_event_types) > 1 else "" - log.info("arm doesn't recognize the following event type%s: %s (log 'UNKNOWN' events to see them)" % (plural_label, ", ".join(missing_event_types))) - try: curses.wrapper(drawTorMonitor, start_time) except UnboundLocalError as exc: diff --git a/arm/starter.py b/arm/starter.py index 0e4ca9e..95dbc46 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -387,6 +387,14 @@ def main(): if arm.util.uiTools.isUnicodeAvailable(): locale.setlocale(locale.LC_ALL, "") + # provides a notice about any event types tor supports but arm doesn't + + missing_event_types = arm.logPanel.getMissingEventTypes() + + if missing_event_types: + plural_label = "s" if len(missing_event_types) > 1 else "" + stem.util.log.info("arm doesn't recognize the following event type%s: %s (log 'UNKNOWN' events to see them)" % (plural_label, ", ".join(missing_event_types))) + arm.controller.start_arm(start_time) if __name__ == '__main__': diff --git a/arm/util/connections.py b/arm/util/connections.py index 423a555..38fdf70 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -74,7 +74,7 @@ RUN_BSD_PROCSTAT = "procstat -f %s" RESOLVERS = [] # connection resolvers available via the singleton constructor RESOLVER_FAILURE_TOLERANCE = 3 # number of subsequent failures before moving on to another resolver RESOLVER_SERIAL_FAILURE_MSG = "Unable to query connections with %s, trying %s" -RESOLVER_FINAL_FAILURE_MSG = "All connection resolvers failed" +RESOLVER_FINAL_FAILURE_MSG = "We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, \"sudo -u <tor user> arm\")." def conf_handler(key, value): if key.startswith("port.label."):

1 0

[arm/master] Dropping isValidIpAddress()
by atagar＠torproject.org 22 Sep '13

22 Sep '13

commit 4cb6013833c95da11d61a080e87035951b9060b3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 17:48:26 2013 -0700 Dropping isValidIpAddress() Unused function. We alredy swapped over to stem's more tested version earlier. --- arm/util/connections.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/arm/util/connections.py b/arm/util/connections.py index 38fdf70..65ba52b 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -107,21 +107,6 @@ CONFIG = conf.config_dict("arm", { PORT_USAGE = {} -def isValidIpAddress(ipStr): - """ - Returns true if input is a valid IPv4 address, false otherwise. - """ - - # checks if theres four period separated values - if not ipStr.count(".") == 3: return False - - # checks that each value in the octet are decimal values between 0-255 - for ipComp in ipStr.split("."): - if not ipComp.isdigit() or int(ipComp) < 0 or int(ipComp) > 255: - return False - - return True - def isIpAddressPrivate(ipAddr): """ Provides true if the IP address belongs on the local network or belongs to

1 0