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

[ooni-probe/master] Merge pull request #188 from TheTorProject/fix/add_version_and_author_to_dnsspoof
by art＠torproject.org 12 Sep '13

12 Sep '13

commit c02788802a77c377e487e9cfb7d7e49e8649333f Merge: 795f2e9 4f4c2ae Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Sep 10 10:12:33 2013 -0700 Merge pull request #188 from TheTorProject/fix/add_version_and_author_to_dnsspoof Add a version and author to dnsspoof data/nettests/manipulation/dnsspoof.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[ooni-probe/master] Add a version and author to dnsspoof
by art＠torproject.org 12 Sep '13

12 Sep '13

commit 053ccd2888deed3045357507db892b0998c8b88c Author: aagbsn <aagbsn(a)extc.org> Date: Tue Sep 10 15:09:25 2013 +0200 Add a version and author to dnsspoof --- data/nettests/manipulation/dnsspoof.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/nettests/manipulation/dnsspoof.py b/data/nettests/manipulation/dnsspoof.py index c9120a4..ca304fc 100644 --- a/data/nettests/manipulation/dnsspoof.py +++ b/data/nettests/manipulation/dnsspoof.py @@ -18,6 +18,8 @@ class UsageOptions(usage.Options): class DNSSpoof(scapyt.ScapyTest): name = "DNS Spoof" + author = "Arturo Filastò" + version = "0.0.1" timeout = 2 usageOptions = UsageOptions @@ -66,5 +68,3 @@ class DNSSpoof(scapyt.ScapyTest): log.msg("Performing query to %s with %s:%s" % (self.hostname, self.controlResolverAddr, self.controlResolverPort)) yield self.sr1(question) - -

1 0

[ooni-probe/master] Change the default ports used by Tor.
by art＠torproject.org 12 Sep '13

12 Sep '13

commit 506b9effb312a0ea858ca30038633151a865b867 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Sep 12 10:58:05 2013 +0200 Change the default ports used by Tor. --- data/ooniprobe.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 77fa980..b86ff69 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -49,8 +49,8 @@ advanced: data_dir: /usr/share/ooni/ oonid_api_port: 8042 tor: - socks_port: 9001 - control_port: 9002 + socks_port: 8801 + control_port: 8802 # Specify the absolute path to the Tor bridges to use for testing #bridges: bridges.list # Specify path of the tor datadirectory.

1 0

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

12 Sep '13

commit 06726a1668d78beeac8a510647822aeed7d6fd8e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 09:16:02 2013 +0000 Update translations for torbirdy_completed --- lv/torbirdy.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 87639b0..6c64512 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -20,11 +20,11 @@ <!ENTITY torbirdy.prefs.privacy.label "Privātums"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> <!ENTITY torbirdy.prefs.security.label "Drošība"> -<!ENTITY torbirdy.prefs.recommended.text "Lietot Tor Birdy (Tor) ieteiktos starpniekdatora iestatījumus"> +<!ENTITY torbirdy.prefs.recommended.text "Lietot ieteiktos starpnieka iestatījumus TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Izvēlieties anonimizācijas pakalpojumu"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Izmantot pielāgotus starpniekdatora iestatījumus"> +<!ENTITY torbirdy.prefs.customsettings.text "Lietot starpnieka pielāgotus iestatījumus"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "LIGZDU mitinātājs:"> <!ENTITY torbirdy.prefs.socks_host.key "h"> @@ -55,7 +55,7 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.label "Lietot atslēgserveri(us): "> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> -<!ENTITY torbirdy.panel.usetor.label "Lietot maršrutētāju Tor sīpols"> +<!ENTITY torbirdy.panel.usetor.label "Lietot Tor sīpola maršrutētāju"> <!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">

1 0

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

12 Sep '13

commit f7bcc4a260c90b12e204d083e0de2cdaf68c3446 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 09:15:57 2013 +0000 Update translations for torbirdy --- lv/torbirdy.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 87639b0..6c64512 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -20,11 +20,11 @@ <!ENTITY torbirdy.prefs.privacy.label "Privātums"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> <!ENTITY torbirdy.prefs.security.label "Drošība"> -<!ENTITY torbirdy.prefs.recommended.text "Lietot Tor Birdy (Tor) ieteiktos starpniekdatora iestatījumus"> +<!ENTITY torbirdy.prefs.recommended.text "Lietot ieteiktos starpnieka iestatījumus TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Izvēlieties anonimizācijas pakalpojumu"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Izmantot pielāgotus starpniekdatora iestatījumus"> +<!ENTITY torbirdy.prefs.customsettings.text "Lietot starpnieka pielāgotus iestatījumus"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "LIGZDU mitinātājs:"> <!ENTITY torbirdy.prefs.socks_host.key "h"> @@ -55,7 +55,7 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.label "Lietot atslēgserveri(us): "> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> -<!ENTITY torbirdy.panel.usetor.label "Lietot maršrutētāju Tor sīpols"> +<!ENTITY torbirdy.panel.usetor.label "Lietot Tor sīpola maršrutētāju"> <!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">

1 0

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

12 Sep '13

commit c5e37cdbf39925d3b26731b972888cd957366729 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 08:46:52 2013 +0000 Update translations for torbirdy_completed --- da/torbirdy.dtd | 8 ++++---- lv/torbirdy.dtd | 10 +++++----- templates/torbirdy.dtd | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/da/torbirdy.dtd b/da/torbirdy.dtd index 1302801..3726272 100644 --- a/da/torbirdy.dtd +++ b/da/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Test proxyindstillinger"> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy-indstillinger"> -<!ENTITY torbirdy.prefs.privacy.label "Privatlivs-indstillinger"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail indstillinger"> -<!ENTITY torbirdy.prefs.security.label "Sikkerhedsindstillinger"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privatliv"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Sikkerhed"> <!ENTITY torbirdy.prefs.recommended.text "Brug de anbefalede proxyindstillinger til TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Vælg en anonymiserings-service"> diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index da0327e..87639b0 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -3,7 +3,7 @@ <!ENTITY torbirdy.accountprefs.startup.key "C"> <!ENTITY torbirdy.accountprefs.minutes.label "Pārbaudīt vai ir jauni ziņojumi katru"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "minūti"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minūtes"> <!ENTITY torbirdy.accountprefs.cancel.button "Atcelt"> <!ENTITY torbirdy.accountprefs.save.button "Saglabāt"> <!ENTITY torbirdy.accountprefs.save.key "S"> @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Pārbaudīt starpnieka iestatījumus"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Starpniekdatora iestatījumi"> -<!ENTITY torbirdy.prefs.privacy.label "Privātuma iestatījumi"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Iestatījumi"> -<!ENTITY torbirdy.prefs.security.label "Drošības iestatījumi"> +<!ENTITY torbirdy.prefs.proxy.label "Starpnieks"> +<!ENTITY torbirdy.prefs.privacy.label "Privātums"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Drošība"> <!ENTITY torbirdy.prefs.recommended.text "Lietot Tor Birdy (Tor) ieteiktos starpniekdatora iestatījumus"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Izvēlieties anonimizācijas pakalpojumu"> diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index 6fefe12..f1acf7e 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Settings"> -<!ENTITY torbirdy.prefs.privacy.label "Privacy Settings"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Settings"> -<!ENTITY torbirdy.prefs.security.label "Security Settings"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privacy"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Security"> <!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">

1 0

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

12 Sep '13

commit b2ca41ea389dbc2bec2131beeb3ebc5014ace86b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 08:46:46 2013 +0000 Update translations for torbirdy --- ar/torbirdy.dtd | 8 ++++---- az/torbirdy.dtd | 4 ++-- bg/torbirdy.dtd | 2 +- bs/torbirdy.dtd | 8 ++++---- ca/torbirdy.dtd | 4 ++-- cs/torbirdy.dtd | 6 +++--- cy/torbirdy.dtd | 4 ++-- da/torbirdy.dtd | 8 ++++---- de/torbirdy.dtd | 8 ++++---- el/torbirdy.dtd | 8 ++++---- eo/torbirdy.dtd | 4 ++-- es/torbirdy.dtd | 8 ++++---- eu/torbirdy.dtd | 8 ++++---- fa/torbirdy.dtd | 8 ++++---- fi/torbirdy.dtd | 4 ++-- fil/torbirdy.dtd | 2 +- fr/torbirdy.dtd | 8 ++++---- gl/torbirdy.dtd | 6 +++--- gu/torbirdy.dtd | 4 ++-- gu_IN/torbirdy.dtd | 8 ++++---- he/torbirdy.dtd | 8 ++++---- hi/torbirdy.dtd | 6 +++--- hr/torbirdy.dtd | 4 ++-- hr_HR/torbirdy.dtd | 8 ++++---- hu/torbirdy.dtd | 8 ++++---- ia/torbirdy.dtd | 2 +- id/torbirdy.dtd | 4 ++-- is/torbirdy.dtd | 2 +- it/torbirdy.dtd | 8 ++++---- ja/torbirdy.dtd | 8 ++++---- ko/torbirdy.dtd | 8 ++++---- ko_KR/torbirdy.dtd | 2 +- lt/torbirdy.dtd | 4 ++-- lv/torbirdy.dtd | 10 +++++----- mk/torbirdy.dtd | 4 ++-- ms_MY/torbirdy.dtd | 2 +- my/torbirdy.dtd | 4 ++-- nb/torbirdy.dtd | 8 ++++---- nl/torbirdy.dtd | 8 ++++---- pa/torbirdy.dtd | 8 ++++---- pl/torbirdy.dtd | 8 ++++---- pl_PL/torbirdy.dtd | 2 +- pt/torbirdy.dtd | 8 ++++---- pt_BR/torbirdy.dtd | 8 ++++---- ro/torbirdy.dtd | 4 ++-- ru/torbirdy.dtd | 8 ++++---- si_LK/torbirdy.dtd | 8 ++++---- sk/torbirdy.dtd | 2 +- sk_SK/torbirdy.dtd | 8 ++++---- sl/torbirdy.dtd | 4 ++-- sn/torbirdy.dtd | 2 +- sq/torbirdy.dtd | 2 +- sr/torbirdy.dtd | 8 ++++---- sv/torbirdy.dtd | 8 ++++---- templates/torbirdy.dtd | 8 ++++---- th/torbirdy.dtd | 8 ++++---- tr/torbirdy.dtd | 8 ++++---- uk/torbirdy.dtd | 8 ++++---- vi/torbirdy.dtd | 4 ++-- zh_CN/torbirdy.dtd | 8 ++++---- zh_TW/torbirdy.dtd | 8 ++++---- 61 files changed, 184 insertions(+), 184 deletions(-) diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd index 18cf5e1..bb47624 100644 --- a/ar/torbirdy.dtd +++ b/ar/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "افحص اعدادات البروكسي"> <!ENTITY torbirdy.prefs.extra2.key "ا"> -<!ENTITY torbirdy.prefs.proxy.label "إعدادات البروكسي"> -<!ENTITY torbirdy.prefs.privacy.label "إعدادات الخصوصية"> -<!ENTITY torbirdy.prefs.enigmail.label "إعدادات Enigmail"> -<!ENTITY torbirdy.prefs.security.label "إعدادات الأمان"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "استعمل خيارات البروكسي الموصى بها لتوربيردي (تور)"> <!ENTITY torbirdy.prefs.recommended.key "م"> <!ENTITY torbirdy.prefs.anonservice.text "اختر خدمة اخفاء هوية"> diff --git a/az/torbirdy.dtd b/az/torbirdy.dtd index 155437e..6a0026c 100644 --- a/az/torbirdy.dtd +++ b/az/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "P"> -<!ENTITY torbirdy.prefs.proxy.label "Proksi qurğuları"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Təhlükəsizlik qurğuları"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "P"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd index 8d81c8e..35c7318 100644 --- a/bg/torbirdy.dtd +++ b/bg/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Прокси настройки"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/bs/torbirdy.dtd b/bs/torbirdy.dtd index 4c2c420..d948103 100644 --- a/bs/torbirdy.dtd +++ b/bs/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Isprobaj Proxy postavke"> <!ENTITY torbirdy.prefs.extra2.key "P"> -<!ENTITY torbirdy.prefs.proxy.label "Proksi postavke"> -<!ENTITY torbirdy.prefs.privacy.label "Podešavanja privatnosti"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail postavke"> -<!ENTITY torbirdy.prefs.security.label "Postavke sigurnosti"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Koristite preporučene proxy postavke za TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Odaberite jedan od anonimizacija usluga"> diff --git a/ca/torbirdy.dtd b/ca/torbirdy.dtd index b50b306..1561d88 100644 --- a/ca/torbirdy.dtd +++ b/ca/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Preferències del servidor intermediari"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Configuració de seguretat"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/cs/torbirdy.dtd b/cs/torbirdy.dtd index 0fbfe80..9e6279a 100644 --- a/cs/torbirdy.dtd +++ b/cs/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Nastavení Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Nastavení soukromý"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Bezpečnostní nastavení"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Použít doporučené nastavení proxy pro TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Použít anonymizační službu"> diff --git a/cy/torbirdy.dtd b/cy/torbirdy.dtd index 556655b..3ceeff8 100644 --- a/cy/torbirdy.dtd +++ b/cy/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Gosodiadau Procsi"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Gosodiadau Diogelwch"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "p"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/da/torbirdy.dtd b/da/torbirdy.dtd index 1302801..3726272 100644 --- a/da/torbirdy.dtd +++ b/da/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Test proxyindstillinger"> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy-indstillinger"> -<!ENTITY torbirdy.prefs.privacy.label "Privatlivs-indstillinger"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail indstillinger"> -<!ENTITY torbirdy.prefs.security.label "Sikkerhedsindstillinger"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privatliv"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Sikkerhed"> <!ENTITY torbirdy.prefs.recommended.text "Brug de anbefalede proxyindstillinger til TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Vælg en anonymiserings-service"> diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 487014f..e737429 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Proxyeinstellungen Testen"> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Einstellungen"> -<!ENTITY torbirdy.prefs.privacy.label "Privatsphären Einstellungen"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail-Einstellungen"> -<!ENTITY torbirdy.prefs.security.label "Sicherheitseinstellungen"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Empfohlene Proxy Einstellungen für TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Anonymisierungsdienst auswählen"> diff --git a/el/torbirdy.dtd b/el/torbirdy.dtd index 9ac3ac6..b28e867 100644 --- a/el/torbirdy.dtd +++ b/el/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Έλεγχος Ρυθμίσεων Proxy"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Ρυθμίσεις Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Ρυθμίσεις απορρήτου"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Ρυθμισεις"> -<!ENTITY torbirdy.prefs.security.label "Ρυθμίσεις ασφαλείας"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Χρήση των προτεινόμενων ρυθμίσεων Proxy για το TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Επιλογή μιας υπηρεσίας ανωνυμίας"> diff --git a/eo/torbirdy.dtd b/eo/torbirdy.dtd index a4ff901..d7312eb 100644 --- a/eo/torbirdy.dtd +++ b/eo/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "A"> -<!ENTITY torbirdy.prefs.proxy.label "Retperant‐agordoj"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Sekurec-agordoj"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "A"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 2285eb8..7276044 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "r"> <!ENTITY torbirdy.prefs.extra2.button "Probar configuración para proxy"> <!ENTITY torbirdy.prefs.extra2.key "b"> -<!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.enigmail.label "Preferencias de Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Preferencias de seguridad"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Usar la configuración de proxy recomendada para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "y"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización"> diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index c97d888..92c1dd3 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy ezarpenak"> -<!ENTITY torbirdy.prefs.privacy.label "Pribatutasun ezarpenak"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail ezarpenak"> -<!ENTITY torbirdy.prefs.security.label "Segurtasun ezarpenak"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "TorBirdy(Tor)rentzako gomendatutako proxy ezarpenak erabili"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Aukeratu anonimotasun zerbitzu bat"> diff --git a/fa/torbirdy.dtd b/fa/torbirdy.dtd index 96d53a5..abf43f9 100644 --- a/fa/torbirdy.dtd +++ b/fa/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "تنظیمات پراکسی"> -<!ENTITY torbirdy.prefs.privacy.label "تنظیمات حریم خصوصی"> -<!ENTITY torbirdy.prefs.enigmail.label "تنظیمات Enigmail"> -<!ENTITY torbirdy.prefs.security.label "تنظیمات امنیت "> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "از تنظیمات پراکسی توصیه شده برای توربِردی استفاده کن (تور)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "یک سرویس ناشناسی انتخاب کنید"> diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd index 1502f15..9540d7d 100644 --- a/fi/torbirdy.dtd +++ b/fi/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "U"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Välityspalvelin Asetukset"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Turvallisuus (asetukset)"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "R"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/fil/torbirdy.dtd b/fil/torbirdy.dtd index 52f05db..6ead76f 100644 --- a/fil/torbirdy.dtd +++ b/fil/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Settings"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index c889244..04d4722 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Tester les paramètres du proxy"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Paramètres proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Paramètres de vie privé"> -<!ENTITY torbirdy.prefs.enigmail.label "Paramètres d'Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Paramètres de sécurité"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Utiliser les paramètres proxy recommandés pour TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Choisir un service d'anonymisation"> diff --git a/gl/torbirdy.dtd b/gl/torbirdy.dtd index ca4fe90..9266d80 100644 --- a/gl/torbirdy.dtd +++ b/gl/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Axustes do proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Axustes de privacidade"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Axustes de seguridade"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key ""> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/gu/torbirdy.dtd b/gu/torbirdy.dtd index 99961ae..546d576 100644 --- a/gu/torbirdy.dtd +++ b/gu/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "P"> -<!ENTITY torbirdy.prefs.proxy.label "પ્રોક્સી ગોઠવણીઓ"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "સલામતી ગોઠવણીઓ"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "P"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/gu_IN/torbirdy.dtd b/gu_IN/torbirdy.dtd index f6ff5bc..f4d5c05 100644 --- a/gu_IN/torbirdy.dtd +++ b/gu_IN/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "પ્રોક્સી ગોઠવણીઓ"> -<!ENTITY torbirdy.prefs.privacy.label "અંગતતા ગોઠવણીઓ"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Settings"> -<!ENTITY torbirdy.prefs.security.label "Security Settings"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "ટોરબર્ડિ (ટોર) માટે આગ્રહ કરેલ પ્રોક્સી ગોઠવણીઓ વાપરો"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "અજ્ઞાત થવાની સેવા પસંદ કરો"> diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index c1727b4..f2e8a17 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "בחן הגדרות Proxy"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "הגדרות שרת פרוקסי"> -<!ENTITY torbirdy.prefs.privacy.label "הגדרות פרטיות"> -<!ENTITY torbirdy.prefs.enigmail.label "הגדרות אניגמייל"> -<!ENTITY torbirdy.prefs.security.label "הגדרות אבטחה"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "השתמש בהגדרות המומלצות עבור TorBirdy ‏(Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "בחר שרות עבור אלמוניות"> diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd index 1fb02f8..8b5f2ef 100644 --- a/hi/torbirdy.dtd +++ b/hi/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "P/प"> -<!ENTITY torbirdy.prefs.proxy.label "प्रोक्सी पतिस्थितियां"> -<!ENTITY torbirdy.prefs.privacy.label "एकांत के लिए पतिस्थितियां"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "सुरक्षा सेटिंग"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "टॉरबर्डी (टॉर) के लिए अनुशंसित प्रोक्सी पतिस्थितियों का प्रयोग करें"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "एक अज्ञातकृत सेवा चुनें"> diff --git a/hr/torbirdy.dtd b/hr/torbirdy.dtd index f02269a..887cadf 100644 --- a/hr/torbirdy.dtd +++ b/hr/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "k"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy postavke"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Sigurnosne postavke"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "k"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd index f7aab6b..3f02fb9 100644 --- a/hr_HR/torbirdy.dtd +++ b/hr_HR/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Isprobaj Proxy postavke"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Postavke Proxya"> -<!ENTITY torbirdy.prefs.privacy.label "Podešavanja privatnosti"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail postavke"> -<!ENTITY torbirdy.prefs.security.label "Postavke sigurnosti"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Koristite preporučene proxy postavke za TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Odaberite jedan od anonimizacija usluga"> diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd index d19b961..d788980 100644 --- a/hu/torbirdy.dtd +++ b/hu/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "a"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "t"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Beállítások"> -<!ENTITY torbirdy.prefs.privacy.label "Adatvédelmi Beállítások"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Beállítások"> -<!ENTITY torbirdy.prefs.security.label "Biztonsági beállítások"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Az ajánlott proxy beállítások használata a TorBirdy (Tor) használatához"> <!ENTITY torbirdy.prefs.recommended.key "a"> <!ENTITY torbirdy.prefs.anonservice.text "Névtelenné tevő szerver választása"> diff --git a/ia/torbirdy.dtd b/ia/torbirdy.dtd index 662a98f..fb2ef1d 100644 --- a/ia/torbirdy.dtd +++ b/ia/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Configurationes de proxy:"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/id/torbirdy.dtd b/id/torbirdy.dtd index a25024e..1d72692 100644 --- a/id/torbirdy.dtd +++ b/id/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "P"> -<!ENTITY torbirdy.prefs.proxy.label "Pengaturan Proxy"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Pengaturan Keamanan"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "P"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/is/torbirdy.dtd b/is/torbirdy.dtd index fe3b170..22ea5fd 100644 --- a/is/torbirdy.dtd +++ b/is/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Beinis Stillingar"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd index 65185af..0b994f2 100644 --- a/it/torbirdy.dtd +++ b/it/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Impostazioni Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Impostazioni Privacy"> -<!ENTITY torbirdy.prefs.enigmail.label "Impostazioni Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Impostazioni di Sicurezza"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Utilizza le impostazioni consigliate per TorBirdy(Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Scegli un servizio per l'anonimato"> diff --git a/ja/torbirdy.dtd b/ja/torbirdy.dtd index 5a5cd7d..0b65600 100644 --- a/ja/torbirdy.dtd +++ b/ja/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "プロキシ設定をテストする"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "プロクシ設定"> -<!ENTITY torbirdy.prefs.privacy.label "プライバシー設定"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmailの設定"> -<!ENTITY torbirdy.prefs.security.label "セキュリティ設定"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Torbirdyに推奨されるプロキシ設定を使用 (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "匿名化サービスを選択"> diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd index ac3cf25..9935a69 100644 --- a/ko/torbirdy.dtd +++ b/ko/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "프록시 설정"> -<!ENTITY torbirdy.prefs.privacy.label "개인 정보 설정"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 설정"> -<!ENTITY torbirdy.prefs.security.label " 보안 설정"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Torbirdy를 위한 추천되는 프록시 설정을 사용합니다."> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "익명화 서비스 선택"> diff --git a/ko_KR/torbirdy.dtd b/ko_KR/torbirdy.dtd index 603a2a5..a02a1ef 100644 --- a/ko_KR/torbirdy.dtd +++ b/ko_KR/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "프록시 설정"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/lt/torbirdy.dtd b/lt/torbirdy.dtd index 531b544..c664da8 100644 --- a/lt/torbirdy.dtd +++ b/lt/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy nustatymai"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Apsaugos nustatymai"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index da0327e..87639b0 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -3,7 +3,7 @@ <!ENTITY torbirdy.accountprefs.startup.key "C"> <!ENTITY torbirdy.accountprefs.minutes.label "Pārbaudīt vai ir jauni ziņojumi katru"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "minūti"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minūtes"> <!ENTITY torbirdy.accountprefs.cancel.button "Atcelt"> <!ENTITY torbirdy.accountprefs.save.button "Saglabāt"> <!ENTITY torbirdy.accountprefs.save.key "S"> @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Pārbaudīt starpnieka iestatījumus"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Starpniekdatora iestatījumi"> -<!ENTITY torbirdy.prefs.privacy.label "Privātuma iestatījumi"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Iestatījumi"> -<!ENTITY torbirdy.prefs.security.label "Drošības iestatījumi"> +<!ENTITY torbirdy.prefs.proxy.label "Starpnieks"> +<!ENTITY torbirdy.prefs.privacy.label "Privātums"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Drošība"> <!ENTITY torbirdy.prefs.recommended.text "Lietot Tor Birdy (Tor) ieteiktos starpniekdatora iestatījumus"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Izvēlieties anonimizācijas pakalpojumu"> diff --git a/mk/torbirdy.dtd b/mk/torbirdy.dtd index 817438b..bff59eb 100644 --- a/mk/torbirdy.dtd +++ b/mk/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "P"> -<!ENTITY torbirdy.prefs.proxy.label "Подесувања на прокси"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Безбедносни подесувања"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "P"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/ms_MY/torbirdy.dtd b/ms_MY/torbirdy.dtd index f7f5852..41cbb50 100644 --- a/ms_MY/torbirdy.dtd +++ b/ms_MY/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Tetapan proxy"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/my/torbirdy.dtd b/my/torbirdy.dtd index 27aab37..cbb8704 100644 --- a/my/torbirdy.dtd +++ b/my/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "P"> -<!ENTITY torbirdy.prefs.proxy.label "ပရောက်ဇီ ချိန်ညှိချက်များ"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "လုံခြုံရေး ချိန်ညှိချက်များ"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd index f08dccc..bf47560 100644 --- a/nb/torbirdy.dtd +++ b/nb/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy innstillinger"> -<!ENTITY torbirdy.prefs.privacy.label "Personvern Innstillinger"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Innstillinger"> -<!ENTITY torbirdy.prefs.security.label "Sikkerhetsinnstillinger"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Bruk de anbefalte proxyinnstillingene for TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Velg en anonymiseringstjeneste"> diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index faa8310..c774a8e 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy configuratie"> -<!ENTITY torbirdy.prefs.privacy.label "Privacy configuratie"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail instellingen"> -<!ENTITY torbirdy.prefs.security.label "Beveiligingsinstellingen"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Aanbevolen configuratie voor TorBirdy (Tor) gebruiken"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Kies een anonimiseringsdienst"> diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd index 61bbb7a..ef9ad92 100644 --- a/pa/torbirdy.dtd +++ b/pa/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "ਪਰਾਕਸੀ ਸੈਟਿੰਗ"> -<!ENTITY torbirdy.prefs.privacy.label "ਪਰਾਈਵੇਸੀ ਸੈਟਿੰਗ"> -<!ENTITY torbirdy.prefs.enigmail.label "ਏਨਿਗਮੇਲ ਸੈਟਿੰਗ"> -<!ENTITY torbirdy.prefs.security.label "ਸੁਰੱਖਿਆ ਸੈਟਿੰਗ"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "ਟੌਰਬਰਡੀ ਲਈ ਆਖੀ ਹੋਈ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਵਰਤੋ ਕਰੋ (ਟੌਰ)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "ਗੁਪਤ ਸਰਵਿਸ ਚੁਣ ਕਰੋ"> diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd index abfd2d9..08c0096 100644 --- a/pl/torbirdy.dtd +++ b/pl/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "w"> -<!ENTITY torbirdy.prefs.proxy.label "Ustawienia Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Ustawienia Prywatności"> -<!ENTITY torbirdy.prefs.enigmail.label "Ustawienia Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Ustawienia bezpieczeństwa"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Użyj zalecanych ustawień proxy dla TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "j"> <!ENTITY torbirdy.prefs.anonservice.text "Wybierz usługę anonimizującą"> diff --git a/pl_PL/torbirdy.dtd b/pl_PL/torbirdy.dtd index dfb4580..734e252 100644 --- a/pl_PL/torbirdy.dtd +++ b/pl_PL/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Ustawienia Proxy"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd index 78385a0..019b1cb 100644 --- a/pt/torbirdy.dtd +++ b/pt/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Testar Configurações de Proxy"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Configurações de Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Configurações de Privacidade"> -<!ENTITY torbirdy.prefs.enigmail.label "Configurações do Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Configurações de Segurança"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Use as configurações de proxy recomendadas para o TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimização"> diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index 76188e6..edecdde 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Testar as Configurações do Proxy"> <!ENTITY torbirdy.prefs.extra2.key "c"> -<!ENTITY torbirdy.prefs.proxy.label "Configurações de Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Configurações de Privacidade"> -<!ENTITY torbirdy.prefs.enigmail.label "Configurações do Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Configurações de segurança"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Utilizar as configurações de proxy recomendadas pelo TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimato"> diff --git a/ro/torbirdy.dtd b/ro/torbirdy.dtd index 60d37ca..c35c52f 100644 --- a/ro/torbirdy.dtd +++ b/ro/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Setări proxy"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Setări de securitate"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd index 638e660..6bb7248 100644 --- a/ru/torbirdy.dtd +++ b/ru/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Настройки Прокси"> -<!ENTITY torbirdy.prefs.privacy.label "Настройки приватности"> -<!ENTITY torbirdy.prefs.enigmail.label "Настройки Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Настройки безопасности"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Использовать рекомендуемые параметры прокси-сервера для TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Выберите сервис анонимизации"> diff --git a/si_LK/torbirdy.dtd b/si_LK/torbirdy.dtd index 27ed005..e6000d0 100644 --- a/si_LK/torbirdy.dtd +++ b/si_LK/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "සේවාදායක සැකසුම්"> -<!ENTITY torbirdy.prefs.privacy.label "පෞද්ගලික සිටවුම් "> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail සිටවුම්"> -<!ENTITY torbirdy.prefs.security.label "ආරක්ෂණ සැකසුම්"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "TorBirdy (Tor) සදහා නිර්දේශිත නියුතු සේවාදායක සිටවුම් භාවිතා කරන්න "> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "නිර්ණාමික සේවාවක් තෝරන්න "> diff --git a/sk/torbirdy.dtd b/sk/torbirdy.dtd index 4e256b1..10d803c 100644 --- a/sk/torbirdy.dtd +++ b/sk/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Nastavenie proxy"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd index 667b6de..b404306 100644 --- a/sk_SK/torbirdy.dtd +++ b/sk_SK/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Nastavenia proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Nastavenia súkromia"> -<!ENTITY torbirdy.prefs.enigmail.label "Nastavenia Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Bezpečnostné nastavenia"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Použiť odporúčané nastavenia proxy pre TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Zvoľ anonymizačnú službu"> diff --git a/sl/torbirdy.dtd b/sl/torbirdy.dtd index 998cfb5..adc2315 100644 --- a/sl/torbirdy.dtd +++ b/sl/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "P"> -<!ENTITY torbirdy.prefs.proxy.label "Nastavitve posredniškega (proxy) strežnika"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Varnostne Nastavitve"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/sn/torbirdy.dtd b/sn/torbirdy.dtd index c825b52..50d9546 100644 --- a/sn/torbirdy.dtd +++ b/sn/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Zvamada"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/sq/torbirdy.dtd b/sq/torbirdy.dtd index 22a0f3e..5005c27 100644 --- a/sq/torbirdy.dtd +++ b/sq/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key ""> -<!ENTITY torbirdy.prefs.proxy.label "Konfigurimi i Proxy"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd index 634f140..e595bc9 100644 --- a/sr/torbirdy.dtd +++ b/sr/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "д"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Прокси подешавања"> -<!ENTITY torbirdy.prefs.privacy.label "Подешавања приватности"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail podešavanja"> -<!ENTITY torbirdy.prefs.security.label "Безбедносне поставке"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Користите препоручена прокси подешавања за TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Изаберите сервис заштите (анонимности)"> diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd index e73eee9..eebbb17 100644 --- a/sv/torbirdy.dtd +++ b/sv/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Testa proxyinställningar"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxyinställningar"> -<!ENTITY torbirdy.prefs.privacy.label "Sekretessinställningar"> -<!ENTITY torbirdy.prefs.enigmail.label "Inställningar för Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Säkerhetsinställningar"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Använd rekommenderade proxyinställningar för TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Välj en anonymiseringstjänst"> diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index 6fefe12..f1acf7e 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Settings"> -<!ENTITY torbirdy.prefs.privacy.label "Privacy Settings"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Settings"> -<!ENTITY torbirdy.prefs.security.label "Security Settings"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privacy"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Security"> <!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> diff --git a/th/torbirdy.dtd b/th/torbirdy.dtd index c4fe418..1625ef2 100644 --- a/th/torbirdy.dtd +++ b/th/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "พ"> -<!ENTITY torbirdy.prefs.proxy.label "ตั้งค่าพร็อกซี"> -<!ENTITY torbirdy.prefs.privacy.label "ตั้งค่าความเป็นส่วนตัว"> -<!ENTITY torbirdy.prefs.enigmail.label "ตั้งค่า Enigmail"> -<!ENTITY torbirdy.prefs.security.label "ตั้งค่าความปลอดภัย"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "ใช้การตั้งค่าพร็อกซีที่แนะนำสำหรับ TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "น"> <!ENTITY torbirdy.prefs.anonservice.text "เลือกบริการปกปิดชื่อ"> diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd index aac96af..08fa8e6 100644 --- a/tr/torbirdy.dtd +++ b/tr/torbirdy.dtd @@ -17,10 +17,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Vekil Ayarlarını Sına"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Ayarları"> -<!ENTITY torbirdy.prefs.privacy.label "Gizlilik Ayarları"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Ayarları"> -<!ENTITY torbirdy.prefs.security.label "Güvenlik Ayarları"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "TorBirdy(Tor) için önerilen proxy ayarlarını kullan"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Anonimleştirme servisi seçin. "> diff --git a/uk/torbirdy.dtd b/uk/torbirdy.dtd index 0e2b77b..b418d4b 100644 --- a/uk/torbirdy.dtd +++ b/uk/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Параметри проксі"> -<!ENTITY torbirdy.prefs.privacy.label "Налаштування Приватності"> -<!ENTITY torbirdy.prefs.enigmail.label "Налаштування Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Параметри безпеки"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Використовувати рекомендовані параметри проксі-сервера для TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Оберіть сервіс анонімізації"> diff --git a/vi/torbirdy.dtd b/vi/torbirdy.dtd index 5646fd6..93ac6d6 100644 --- a/vi/torbirdy.dtd +++ b/vi/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key ""> <!ENTITY torbirdy.prefs.extra2.button ""> <!ENTITY torbirdy.prefs.extra2.key "y"> -<!ENTITY torbirdy.prefs.proxy.label "Những Cài đặt máy chủ proxy"> +<!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label "Thiết lập Bảo mật"> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text ""> <!ENTITY torbirdy.prefs.recommended.key "y"> <!ENTITY torbirdy.prefs.anonservice.text ""> diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 7c3e945..79e8260 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "测试代理设置"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "代理设置"> -<!ENTITY torbirdy.prefs.privacy.label "隐私设置"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 设置"> -<!ENTITY torbirdy.prefs.security.label "安全设置"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "使用推荐的 TorBirdy (Tor) 代理设置"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "选择匿名服务"> diff --git a/zh_TW/torbirdy.dtd b/zh_TW/torbirdy.dtd index c38005c..4c1eb92 100644 --- a/zh_TW/torbirdy.dtd +++ b/zh_TW/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "測試伺服器設定"> <!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "代理伺服器(proxy)設定"> -<!ENTITY torbirdy.prefs.privacy.label "隱私權設定"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 設定"> -<!ENTITY torbirdy.prefs.security.label "安全設定"> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "在TorBirdy (Tor)中使用建議的代理伺服器設定"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "請選擇一個匿名服務">

1 0

[torbirdy/master] Revert back to our older method of preventing namespace pollution; it works better
by sukhbir＠torproject.org 12 Sep '13

12 Sep '13

commit dff1857b739e23ef98d328bd513b5a5e03cb13d0 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Sep 12 00:56:24 2013 -0400 Revert back to our older method of preventing namespace pollution; it works better --- chrome/content/accountpref.js | 68 ++--- chrome/content/firstruninfo.js | 8 +- chrome/content/preferences.js | 580 ++++++++++++++++++++-------------------- 3 files changed, 331 insertions(+), 325 deletions(-) diff --git a/chrome/content/accountpref.js b/chrome/content/accountpref.js index bea512d..4611086 100644 --- a/chrome/content/accountpref.js +++ b/chrome/content/accountpref.js @@ -1,55 +1,57 @@ if (!org) var org = {}; if (!org.torbirdy) org.torbirdy = {}; -if (!org.torbirdy.accountprefs) org.torbirdy.accountprefs = { +if (!org.torbirdy.accountprefs) org.torbirdy.accountprefs = new function() { + var pub = {}; - account: window.arguments[0], + pub.account = window.arguments[0]; - onLoad: function() { - var nameLabel = document.getElementById("torbirdy-account-name"); - this.startup = document.getElementById("torbirdy-check-startup"); - this.dobiff = document.getElementById("torbirdy-check-new"); - this.biffminutes = document.getElementById("torbirdy-check-minutes"); - nameLabel.value = this.account.prettyName; + pub.onLoad = function() { + pub.nameLabel = document.getElementById("torbirdy-account-name"); + pub.startup = document.getElementById("torbirdy-check-startup"); + pub.dobiff = document.getElementById("torbirdy-check-new"); + pub.biffminutes = document.getElementById("torbirdy-check-minutes"); + pub.nameLabel.value = pub.account.prettyName; - if (this.account.loginAtStartUp) { - this.startup.checked = true; + if (pub.account.loginAtStartUp) { + pub.startup.checked = true; } else { - this.startup.checked = false; + pub.startup.checked = false; } - if (this.account.doBiff) { - this.dobiff.checked = true; - this.biffminutes.disabled = false; - this.biffminutes.value = this.account.biffMinutes; + if (pub.account.doBiff) { + pub.dobiff.checked = true; + pub.biffminutes.disabled = false; + pub.biffminutes.value = pub.account.biffMinutes; } else { - this.dobiff.checked = false; - this.biffminutes.disabled = true; - this.biffminutes.value = this.account.biffMinutes; + pub.dobiff.checked = false; + pub.biffminutes.disabled = true; + pub.biffminutes.value = pub.account.biffMinutes; } - }, + }; - onAccept: function() { - if (this.startup.checked) { - this.account.loginAtStartUp = true; + pub.onAccept = function() { + if (pub.startup.checked) { + pub.account.loginAtStartUp = true; } else { - this.account.loginAtStartUp = false; + pub.account.loginAtStartUp = false; } - if (this.dobiff.checked) { - this.account.doBiff = true; - this.account.biffMinutes = this.biffminutes.value; + if (pub.dobiff.checked) { + pub.account.doBiff = true; + pub.account.biffMinutes = pub.biffminutes.value; } else { - this.account.doBiff = false; + pub.account.doBiff = false; } - }, + }; - onToggleCheck: function() { - if (this.biffminutes.disabled) { - this.biffminutes.disabled = false; + pub.onToggleCheck = function() { + if (pub.biffminutes.disabled) { + pub.biffminutes.disabled = false; } else { - this.biffminutes.disabled = true; + pub.biffminutes.disabled = true; } - } + }; + return pub; }; diff --git a/chrome/content/firstruninfo.js b/chrome/content/firstruninfo.js index 6574529..cecae4a 100644 --- a/chrome/content/firstruninfo.js +++ b/chrome/content/firstruninfo.js @@ -1,9 +1,10 @@ if (!org) var org = {}; if (!org.torbirdy) org.torbirdy = {}; -if (!org.torbirdy.firstrun) org.torbirdy.firstrun = { +if (!org.torbirdy.firstrun) org.torbirdy.firstrun = new function() { + var pub = {}; - onLoad: function() { + pub.onLoad = function() { var strings = document.getElementById("torbirdy-strings-firstrun"); var description = document.getElementById("torbirdy-firstrun-info"); @@ -12,6 +13,7 @@ if (!org.torbirdy.firstrun) org.torbirdy.firstrun = { var torbirdyWebsite = strings.getString("torbirdy.website"); var website = document.getElementById("torbirdy-website"); website.value = torbirdyWebsite; - } + }; + return pub; }; diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 3578f0d..3461aa4 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -1,42 +1,43 @@ if (!org) var org = {}; if (!org.torbirdy) org.torbirdy = {}; -if (!org.torbirdy.prefs) org.torbirdy.prefs = { +if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { + var pub = {}; - prefBranch: "extensions.torbirdy.", - customBranch: "extensions.torbirdy.custom.", + pub.prefBranch = "extensions.torbirdy."; + pub.customBranch = "extensions.torbirdy.custom."; - torKeyserver: "hkp://2eghzlv2wwcq7u7y.onion", - jondoKeyserver: "hkp://pool.sks-keyservers.net", + pub.torKeyserver = "hkp://2eghzlv2wwcq7u7y.onion"; + pub.jondoKeyserver = "hkp://pool.sks-keyservers.net"; - prefs: Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch), + pub.prefs = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); - torBirdyPref: Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService).getBranch(this.customBranch), + pub.torBirdyPref = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService).getBranch(pub.customBranch); - acctMgr: Components.classes["@mozilla.org/messenger/account-manager;1"] - .getService(Components.interfaces.nsIMsgAccountManager), + pub.acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"] + .getService(Components.interfaces.nsIMsgAccountManager); - strBundle: Components.classes["@mozilla.org/intl/stringbundle;1"] - .getService(Components.interfaces.nsIStringBundleService) - .createBundle("chrome://castironthunderbirdclub/locale/torbirdy.properties"), + var bundles = Components.classes["@mozilla.org/intl/stringbundle;1"] + .getService(Components.interfaces.nsIStringBundleService); + pub.strBundle = bundles.createBundle("chrome://castironthunderbirdclub/locale/torbirdy.properties"); - setDefaultPrefs: function() { - this.prefs.setCharPref("network.proxy.socks", "127.0.0.1"); - this.prefs.setIntPref("network.proxy.socks_port", 9150); - this.prefs.clearUserPref("network.proxy.http"); - this.prefs.clearUserPref("network.proxy.http_port"); - this.prefs.clearUserPref("network.proxy.ssl"); - this.prefs.clearUserPref("network.proxy.ssl_port"); - }, + pub.setDefaultPrefs = function() { + pub.prefs.setCharPref("network.proxy.socks", "127.0.0.1"); + pub.prefs.setIntPref("network.proxy.socks_port", 9150); + pub.prefs.clearUserPref("network.proxy.http"); + pub.prefs.clearUserPref("network.proxy.http_port"); + pub.prefs.clearUserPref("network.proxy.ssl"); + pub.prefs.clearUserPref("network.proxy.ssl_port"); + }; - resetNetworkProxy: function() { - this.prefs.setIntPref("network.proxy.type", 1); - }, + pub.resetNetworkProxy = function() { + pub.prefs.setIntPref("network.proxy.type", 1); + }; - setEnigmailPrefs: function(anonService) { - if (this.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) { + pub.setEnigmailPrefs = function(anonService) { + if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) { if (anonService === "tor") { return "--no-emit-version " + "--no-comments " + @@ -66,82 +67,82 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:4001"; } } - }, + }; - updateKeyserver: function(anonService) { + pub.updateKeyserver = function(anonService) { var extension = "extensions.enigmail.keyserver"; - var keyserver = this.enigmailKeyserver; + var keyserver = pub.enigmailKeyserver; if (typeof keyserver === "undefined") { - var keyserverValue = (anonService === "tor") ? this.torKeyserver : this.jondoKeyserver; + var keyserverValue = (anonService === "tor") ? pub.torKeyserver : pub.jondoKeyserver; } else { var keyserverValue = keyserver.value; } if (anonService === "tor") { - this.setPreferences(extension, keyserverValue); + pub.setPreferences(extension, keyserverValue); } if (anonService === "jondo") { - this.setPreferences(extension, keyserverValue); + pub.setPreferences(extension, keyserverValue); } - }, + }; - restoreEnigmailPrefs: function() { - this.prefs.setCharPref("extensions.enigmail.agentAdditionalParam", this.setEnigmailPrefs("tor")); - this.updateKeyserver("tor"); - }, + pub.restoreEnigmailPrefs = function() { + pub.prefs.setCharPref("extensions.enigmail.agentAdditionalParam", pub.setEnigmailPrefs("tor")); + pub.updateKeyserver("tor"); + }; - clearCustomPrefs: function() { - var customPrefs = this.torBirdyPref.getChildList("", {}); + pub.clearCustomPrefs = function() { + var customPrefs = pub.torBirdyPref.getChildList("", {}); for (var i = 0; i < customPrefs.length; i++) { - this.prefs.clearUserPref(this.customBranch + customPrefs[i]); + pub.prefs.clearUserPref(pub.customBranch + customPrefs[i]); } - }, + }; - clearSinglePref: function(pref) { - this.prefs.clearUserPref(this.customBranch + pref); - }, + pub.clearSinglePref = function(pref) { + pub.prefs.clearUserPref(pub.customBranch + pref); + }; - fetchAllMessages: function() { - if (this.fetchAllMails.checked) { - this.imapIdle.checked = true; - this.startupFolder.checked = true; + pub.fetchAllMessages = function() { + if (pub.fetchAllMails.checked) { + pub.imapIdle.checked = true; + pub.startupFolder.checked = true; } else { - this.imapIdle.checked = false; - this.startupFolder.checked = false; + pub.imapIdle.checked = false; + pub.startupFolder.checked = false; } - }, + }; - checkSetting: function() { - var index = this.anonService.selectedIndex; + pub.checkSetting = function() { + var index = pub.anonService.selectedIndex; if (index === 2) { - this.socksHost.disabled = false; - this.socksPort.disabled = false; + pub.socksHost.disabled = false; + pub.socksPort.disabled = false; } else { - this.socksHost.disabled = true; - this.socksPort.disabled = true; + pub.socksHost.disabled = true; + pub.socksPort.disabled = true; } if (index === 1) { - this.anonCustomService.disabled = false; - var service = this.anonCustomService.selectedIndex; - if (this.anonCustomService.selectedIndex === 0) { - this.enigmailKeyserver.value = this.jondoKeyserver; + pub.anonCustomService.disabled = false; + var service = pub.anonCustomService.selectedIndex; + if (pub.anonCustomService.selectedIndex === 0) { + pub.enigmailKeyserver.value = pub.jondoKeyserver; } - if (this.anonCustomService.selectedIndex === 1) { - this.enigmailKeyserver.value = this.torKeyserver; + if (pub.anonCustomService.selectedIndex === 1) { + pub.enigmailKeyserver.value = pub.torKeyserver; } } else { - this.anonCustomService.disabled = true; + pub.anonCustomService.disabled = true; } if (index === 0 || index === 2 || index === 3) { - this.enigmailKeyserver.value = this.torKeyserver; + pub.enigmailKeyserver.value = pub.torKeyserver; } - }, + }; - getAccount: function() { + pub.getAccount = function() { var mailAccounts = []; - var accounts = this.acctMgr.accounts; + var accounts = pub.acctMgr.accounts; for (var i = 0; i < accounts.Count(); i++) { var account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer; var name = account.prettyName; @@ -150,17 +151,17 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { } } return mailAccounts; - }, + }; - selectMailAccount: function() { - var index = this.mailAccount.selectedIndex; + pub.selectMailAccount = function() { + var index = pub.mailAccount.selectedIndex; if (!(index === 0)) { // For email accounts, configure accordingly. var sAccount = null; - var account = this.getAccount(); + var account = pub.getAccount(); for (var i = 0; i < account.length; i++) { - if (account[i].key === this.mailAccount.value) { + if (account[i].key === pub.mailAccount.value) { sAccount = i; } } @@ -170,201 +171,201 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { "chrome, centerscreen, modal, resizable=yes", account[sAccount]).focus(); } - this.mailAccount.selectedIndex = 0; - }, + pub.mailAccount.selectedIndex = 0; + }; - setPanelSettings: function(proxyname, color) { + pub.setPanelSettings = function(proxyname, color) { var win = Components.classes['@mozilla.org/appshell/window-mediator;1'] .getService(Components.interfaces.nsIWindowMediator) .getMostRecentWindow('mail:3pane'); - this.myPanel = win.document.getElementById("torbirdy-my-panel"); - this.myPanel.label = proxyname; - this.myPanel.style.color = color; - }, - - resetAll: function() { - this.resetNetworkProxy(); - this.setDefaultPrefs(); - this.clearCustomPrefs(); - this.restoreEnigmailPrefs(); - }, - - setPreferences: function(preference, value) { + pub.myPanel = win.document.getElementById("torbirdy-my-panel"); + pub.myPanel.label = proxyname; + pub.myPanel.style.color = color; + }; + + pub.resetAll = function() { + pub.resetNetworkProxy(); + pub.setDefaultPrefs(); + pub.clearCustomPrefs(); + pub.restoreEnigmailPrefs(); + }; + + pub.setPreferences = function(preference, value) { // Set the preferences both for Thunderbird and our custom branch. if (typeof value === "string") { - this.prefs.setCharPref(preference, value); - this.prefs.setCharPref(this.customBranch + preference, value); + pub.prefs.setCharPref(preference, value); + pub.prefs.setCharPref(pub.customBranch + preference, value); } if (typeof value === "boolean") { - this.prefs.setBoolPref(preference, value); - this.prefs.setBoolPref(this.customBranch + preference, value); + pub.prefs.setBoolPref(preference, value); + pub.prefs.setBoolPref(pub.customBranch + preference, value); } if (typeof value === "number") { - this.prefs.setIntPref(preference, value); - this.prefs.setIntPref(this.customBranch + preference, value); + pub.prefs.setIntPref(preference, value); + pub.prefs.setIntPref(pub.customBranch + preference, value); } - }, + }; - setProxyTor: function() { + pub.setProxyTor = function() { // Set Tor proxy - this.resetAll(); + pub.resetAll(); - this.setPanelSettings(this.strBundle.GetStringFromName("torbirdy.enabled.tor"), "green"); - this.prefs.setIntPref(this.prefBranch + 'proxy', 0); - }, + pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.tor"), "green"); + pub.prefs.setIntPref(pub.prefBranch + 'proxy', 0); + }; - setProxyJonDo: function() { - this.resetNetworkProxy(); - this.clearCustomPrefs(); + pub.setProxyJonDo = function() { + pub.resetNetworkProxy(); + pub.clearCustomPrefs(); - this.setPreferences("network.proxy.socks", "127.0.0.1"); - this.setPreferences("network.proxy.socks_port", 4001); + pub.setPreferences("network.proxy.socks", "127.0.0.1"); + pub.setPreferences("network.proxy.socks_port", 4001); // SSL. - this.setPreferences("network.proxy.ssl", "127.0.0.1"); - this.setPreferences("network.proxy.ssl_port", 4001); + pub.setPreferences("network.proxy.ssl", "127.0.0.1"); + pub.setPreferences("network.proxy.ssl_port", 4001); // HTTP. - this.setPreferences("network.proxy.http", "127.0.0.1"); - this.setPreferences("network.proxy.http_port", 4001); + pub.setPreferences("network.proxy.http", "127.0.0.1"); + pub.setPreferences("network.proxy.http_port", 4001); // Disable pipelining. - this.setPreferences("network.http.pipelining", false); - this.setPreferences("network.http.pipelining.ssl", false); - this.setPreferences("network.http.proxy.pipelining", false); + pub.setPreferences("network.http.pipelining", false); + pub.setPreferences("network.http.pipelining.ssl", false); + pub.setPreferences("network.http.proxy.pipelining", false); // Enigmail. - this.setPreferences("extensions.enigmail.agentAdditionalParam", this.setEnigmailPrefs("jondo")); - this.updateKeyserver("jondo"); + pub.setPreferences("extensions.enigmail.agentAdditionalParam", pub.setEnigmailPrefs("jondo")); + pub.updateKeyserver("jondo"); - this.setPanelSettings(this.strBundle.GetStringFromName("torbirdy.enabled.jondo"), "green"); - this.prefs.setIntPref(this.prefBranch + 'proxy', 1); - this.prefs.setIntPref(this.prefBranch + 'proxy.type', 0); - }, + pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.jondo"), "green"); + pub.prefs.setIntPref(pub.prefBranch + 'proxy', 1); + pub.prefs.setIntPref(pub.prefBranch + 'proxy.type', 0); + }; - setProxyWhonix: function() { - this.resetAll(); + pub.setProxyWhonix = function() { + pub.resetAll(); - this.setPreferences("network.proxy.socks", "192.168.0.10"); - this.setPreferences("network.proxy.socks_port", 9102); + pub.setPreferences("network.proxy.socks", "192.168.0.10"); + pub.setPreferences("network.proxy.socks_port", 9102); - this.setPanelSettings(this.strBundle.GetStringFromName("torbirdy.enabled.whonix"), "green"); - this.prefs.setIntPref(this.prefBranch + 'proxy', 1); - this.prefs.setIntPref(this.prefBranch + 'proxy.type', 1); - }, + pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.whonix"), "green"); + pub.prefs.setIntPref(pub.prefBranch + 'proxy', 1); + pub.prefs.setIntPref(pub.prefBranch + 'proxy.type', 1); + }; - setProxyCustom: function() { - this.resetAll(); + pub.setProxyCustom = function() { + pub.resetAll(); - var socksHost = this.socksHost.value; - var socksPort = this.socksPort.value; + var socksHost = pub.socksHost.value; + var socksPort = pub.socksPort.value; // Set them now. - this.setPreferences("network.proxy.socks", socksHost); - this.setPreferences("network.proxy.socks_port", parseInt(socksPort, 10)); + pub.setPreferences("network.proxy.socks", socksHost); + pub.setPreferences("network.proxy.socks_port", parseInt(socksPort, 10)); - this.setPanelSettings(this.strBundle.GetStringFromName("torbirdy.enabled.custom"), "green"); - this.prefs.setIntPref(this.prefBranch + 'proxy', 2); - }, + pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.custom"), "green"); + pub.prefs.setIntPref(pub.prefBranch + 'proxy', 2); + }; - setProxyTransparent: function() { - this.setPreferences("network.proxy.type", 0); + pub.setProxyTransparent = function() { + pub.setPreferences("network.proxy.type", 0); - this.setPanelSettings(this.strBundle.GetStringFromName("torbirdy.enabled.torification"), "red"); - this.prefs.setIntPref(this.prefBranch + 'proxy', 3); - }, + pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.torification"), "red"); + pub.prefs.setIntPref(pub.prefBranch + 'proxy', 3); + }; /* Save */ - onAccept: function() { - var index = this.anonService.selectedIndex; + pub.onAccept = function() { + var index = pub.anonService.selectedIndex; // Default (recommended) settings for TorBirdy. if (index === 0) { // Set proxies for Tor. - this.setProxyTor(); + pub.setProxyTor(); } // Anonymization service. if (index === 1) { - var anonServiceType = this.anonCustomService.selectedIndex; + var anonServiceType = pub.anonCustomService.selectedIndex; if (anonServiceType === 0 || typeof anonServiceType === "undefined") { // Set proxies for JonDo. - this.setProxyJonDo(); + pub.setProxyJonDo(); } if (anonServiceType === 1) { // Set Whonix. - this.setProxyWhonix(); + pub.setProxyWhonix(); } } // Custom proxy. if (index === 2) { - this.setProxyCustom(); + pub.setProxyCustom(); } // Transparent Anonymisation. if (index === 3) { // Disable the proxy. - this.setProxyTransparent(); + pub.setProxyTransparent(); } /* Privacy */ var idlePref = 'mail.server.default.use_idle'; - if (this.imapIdle.checked) { - this.setPreferences(idlePref, true); + if (pub.imapIdle.checked) { + pub.setPreferences(idlePref, true); } else { - this.setPreferences(idlePref, false); + pub.setPreferences(idlePref, false); } // Last accessed folder. // default: false - if (this.startupFolder.checked) { - this.prefs.setBoolPref(this.prefBranch + 'startup_folder', true); + if (pub.startupFolder.checked) { + pub.prefs.setBoolPref(pub.prefBranch + 'startup_folder', true); } else { - this.prefs.setBoolPref(this.prefBranch + 'startup_folder', false); + pub.prefs.setBoolPref(pub.prefBranch + 'startup_folder', false); } // Time zone. // default: true - var timezone = this.timezone.checked; - // Only update this if required. - if (timezone === this.prefs.getBoolPref(this.prefBranch + 'timezone')) { + var timezone = pub.timezone.checked; + // Only update pub if required. + if (timezone === pub.prefs.getBoolPref(pub.prefBranch + 'timezone')) { var env = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); if (timezone) { - this.prefs.setBoolPref(this.prefBranch + 'timezone', false); + pub.prefs.setBoolPref(pub.prefBranch + 'timezone', false); env.set('TZ', ''); } else { - this.prefs.setBoolPref(this.prefBranch + 'timezone', true); + pub.prefs.setBoolPref(pub.prefBranch + 'timezone', true); env.set('TZ', 'UTC'); } - // Ask the user to restart Thunderbird. We can't do this for the user + // Ask the user to restart Thunderbird. We can't do pub for the user // because the environment variables are not reset without quitting // Thunderbird and starting it again. var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); - prompts.alert(null, this.strBundle.GetStringFromName("torbirdy.name"), - this.strBundle.GetStringFromName("torbirdy.restart")); + prompts.alert(null, pub.strBundle.GetStringFromName("torbirdy.name"), + pub.strBundle.GetStringFromName("torbirdy.restart")); } // Fetch all messages for all accounts. // default: false // Only change the state if it is required. - if (this.fetchAllMails.checked !== this.prefs.getBoolPref(this.prefBranch + 'fetchall')) { - var accounts = this.getAccount(); - if (this.fetchAllMails.checked) { - this.prefs.setBoolPref(this.prefBranch + 'fetchall', true); + if (pub.fetchAllMails.checked !== pub.prefs.getBoolPref(pub.prefBranch + 'fetchall')) { + var accounts = pub.getAccount(); + if (pub.fetchAllMails.checked) { + pub.prefs.setBoolPref(pub.prefBranch + 'fetchall', true); for (var i = 0; i < accounts.length; i++) { accounts[i].loginAtStartUp = true; accounts[i].doBiff = true; } } else { - this.prefs.setBoolPref(this.prefBranch + 'fetchall', false); + pub.prefs.setBoolPref(pub.prefBranch + 'fetchall', false); for (var i = 0; i < accounts.length; i++) { accounts[i].loginAtStartUp = false; accounts[i].doBiff = false; @@ -374,99 +375,99 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { // Enigmail. // --throw-keyids - default: false - if (this.enigmailKeyId.checked) { - this.prefs.setBoolPref(this.prefBranch + 'enigmail.throwkeyid', true); + if (pub.enigmailKeyId.checked) { + pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.throwkeyid', true); } else { - this.prefs.setBoolPref(this.prefBranch + 'enigmail.throwkeyid', false); + pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.throwkeyid', false); } // Confirm before sending - default: false var enigmailConfirmPref = "extensions.enigmail.confirmBeforeSend"; - if (this.enigmailConfirmEmail.checked) { - this.prefs.setBoolPref(enigmailConfirmPref, true); - this.prefs.setBoolPref(this.prefBranch + 'enigmail.confirmemail', true); + if (pub.enigmailConfirmEmail.checked) { + pub.prefs.setBoolPref(enigmailConfirmPref, true); + pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.confirmemail', true); } else { - this.prefs.setBoolPref(enigmailConfirmPref, false); - this.prefs.setBoolPref(this.prefBranch + 'enigmail.confirmemail', false); + pub.prefs.setBoolPref(enigmailConfirmPref, false); + pub.prefs.setBoolPref(pub.prefBranch + 'enigmail.confirmemail', false); } // Thunderbird's email wizard - default: false - if (this.emailWizard.checked) { - this.prefs.setBoolPref(this.prefBranch + 'emailwizard', true); + if (pub.emailWizard.checked) { + pub.prefs.setBoolPref(pub.prefBranch + 'emailwizard', true); } else { - this.prefs.setBoolPref(this.prefBranch + 'emailwizard', false); + pub.prefs.setBoolPref(pub.prefBranch + 'emailwizard', false); } // Insecure renegotiation - default: false (opt-out for mailservers that do // not support secure renegotiation yet) var securityRenegotiation = 'security.ssl.require_safe_negotiation'; var securityWarn = 'security.ssl.treat_unsafe_negotiation_as_broken'; - if (this.secureRenegotiation.checked) { - this.setPreferences(securityRenegotiation, false); - this.setPreferences(securityWarn, false); + if (pub.secureRenegotiation.checked) { + pub.setPreferences(securityRenegotiation, false); + pub.setPreferences(securityWarn, false); } else { - this.clearSinglePref(securityRenegotiation); - this.clearSinglePref(securityWarn); + pub.clearSinglePref(securityRenegotiation); + pub.clearSinglePref(securityWarn); } if (index === 1) { // JonDo. - if (this.anonCustomService.selectedIndex === 0) { - this.setPreferences("extensions.enigmail.agentAdditionalParam", this.setEnigmailPrefs("jondo")); + if (pub.anonCustomService.selectedIndex === 0) { + pub.setPreferences("extensions.enigmail.agentAdditionalParam", pub.setEnigmailPrefs("jondo")); } // Whonix. - if (this.anonCustomService.selectedIndex === 1) { - this.setPreferences("extensions.enigmail.agentAdditionalParam", this.setEnigmailPrefs("tor")); + if (pub.anonCustomService.selectedIndex === 1) { + pub.setPreferences("extensions.enigmail.agentAdditionalParam", pub.setEnigmailPrefs("tor")); } } if (index === 0 || index === 2 || index === 3) { - this.setPreferences("extensions.enigmail.agentAdditionalParam", this.setEnigmailPrefs("tor")); + pub.setPreferences("extensions.enigmail.agentAdditionalParam", pub.setEnigmailPrefs("tor")); } - }, + }; /* Load */ - onLoad: function() { + pub.onLoad = function() { // Proxy. - this.anonCustomService = document.getElementById('torbirdy-anonservice'); - this.anonService = document.getElementById('torbirdy-proxy-settings'); - this.anonType = document.getElementById('torbirdy-anon-settings'); - this.socksHost = document.getElementById('torbirdy-socks-host'); - this.socksPort = document.getElementById('torbirdy-socks-port'); - this.torification = document.getElementById('torbirdy-torification'); + pub.anonCustomService = document.getElementById('torbirdy-anonservice'); + pub.anonService = document.getElementById('torbirdy-proxy-settings'); + pub.anonType = document.getElementById('torbirdy-anon-settings'); + pub.socksHost = document.getElementById('torbirdy-socks-host'); + pub.socksPort = document.getElementById('torbirdy-socks-port'); + pub.torification = document.getElementById('torbirdy-torification'); // Privacy. - this.mailAccount = document.getElementById('torbirdy-mail-accounts'); - this.imapIdle = document.getElementById('torbirdy-idle'); - this.startupFolder = document.getElementById('torbirdy-startup-folder'); - this.timezone = document.getElementById('torbirdy-timezone'); - this.emailWizard = document.getElementById('torbirdy-email-wizard'); - this.fetchAllMails = document.getElementById('torbirdy-email-automatic'); + pub.mailAccount = document.getElementById('torbirdy-mail-accounts'); + pub.imapIdle = document.getElementById('torbirdy-idle'); + pub.startupFolder = document.getElementById('torbirdy-startup-folder'); + pub.timezone = document.getElementById('torbirdy-timezone'); + pub.emailWizard = document.getElementById('torbirdy-email-wizard'); + pub.fetchAllMails = document.getElementById('torbirdy-email-automatic'); // Enigmail. - this.enigmailKeyId = document.getElementById('torbirdy-enigmail-throwkeyid'); - this.enigmailKeyserver = document.getElementById('torbirdy-enigmail-keyserver'); - this.enigmailConfirmEmail = document.getElementById('torbirdy-confirm-email'); + pub.enigmailKeyId = document.getElementById('torbirdy-enigmail-throwkeyid'); + pub.enigmailKeyserver = document.getElementById('torbirdy-enigmail-keyserver'); + pub.enigmailConfirmEmail = document.getElementById('torbirdy-confirm-email'); // Security. - this.secureRenegotiation = document.getElementById('torbirdy-renegotiation'); + pub.secureRenegotiation = document.getElementById('torbirdy-renegotiation'); // Make sure the user really wants to change these settings. - var warnPrompt = this.prefs.getBoolPref("extensions.torbirdy.warn"); + var warnPrompt = pub.prefs.getBoolPref("extensions.torbirdy.warn"); if (warnPrompt) { var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); var check = {value: true}; - var result = prompts.confirmCheck(null, this.strBundle.GetStringFromName('torbirdy.email.advanced.title'), - this.strBundle.GetStringFromName('torbirdy.email.advanced'), - this.strBundle.GetStringFromName('torbirdy.email.advanced.nextwarning'), + var result = prompts.confirmCheck(null, pub.strBundle.GetStringFromName('torbirdy.email.advanced.title'), + pub.strBundle.GetStringFromName('torbirdy.email.advanced'), + pub.strBundle.GetStringFromName('torbirdy.email.advanced.nextwarning'), check); if (!result) { window.close(); } else { if (!check.value) { - this.prefs.setBoolPref("extensions.torbirdy.warn", false); + pub.prefs.setBoolPref("extensions.torbirdy.warn", false); } } } @@ -475,36 +476,36 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { PROXY */ // Load the preference values. - var anonService = this.prefs.getIntPref(this.prefBranch + 'proxy'); - this.anonService.selectedIndex = anonService; + var anonService = pub.prefs.getIntPref(pub.prefBranch + 'proxy'); + pub.anonService.selectedIndex = anonService; - this.socksHost.value = this.prefs.getCharPref("network.proxy.socks"); - this.socksPort.value = this.prefs.getIntPref("network.proxy.socks_port"); + pub.socksHost.value = pub.prefs.getCharPref("network.proxy.socks"); + pub.socksPort.value = pub.prefs.getIntPref("network.proxy.socks_port"); // Tor. if (anonService === 0) { - this.socksHost.value = '127.0.0.1'; - this.socksPort.value = '9150'; + pub.socksHost.value = '127.0.0.1'; + pub.socksPort.value = '9150'; } // JonDo/Whonix. if (anonService === 1) { - var anonCustomService = this.prefs.getIntPref(this.prefBranch + 'proxy.type'); - this.anonType.disabled = false; - this.anonCustomService.disabled = false; - this.anonCustomService.selectedIndex = anonCustomService; + var anonCustomService = pub.prefs.getIntPref(pub.prefBranch + 'proxy.type'); + pub.anonType.disabled = false; + pub.anonCustomService.disabled = false; + pub.anonCustomService.selectedIndex = anonCustomService; } // Custom. if (anonService === 2) { - var socksHost = this.prefs.getCharPref(this.customBranch + 'network.proxy.socks'); - var socksPort = this.prefs.getIntPref(this.customBranch + 'network.proxy.socks_port'); + var socksHost = pub.prefs.getCharPref(pub.customBranch + 'network.proxy.socks'); + var socksPort = pub.prefs.getIntPref(pub.customBranch + 'network.proxy.socks_port'); - this.socksHost.value = socksHost; - this.socksPort.value = socksPort; + pub.socksHost.value = socksHost; + pub.socksPort.value = socksPort; // Enable the settings. - this.socksHost.disabled = false; - this.socksPort.disabled = false; + pub.socksHost.disabled = false; + pub.socksPort.disabled = false; } /* @@ -512,129 +513,130 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = { */ // Global settings. // IDLE. - var idlePref = this.customBranch + 'mail.server.default.use_idle'; - if (this.prefs.prefHasUserValue(idlePref)) { - var idlePrefValue = this.prefs.getBoolPref(idlePref); + var idlePref = pub.customBranch + 'mail.server.default.use_idle'; + if (pub.prefs.prefHasUserValue(idlePref)) { + var idlePrefValue = pub.prefs.getBoolPref(idlePref); } if (idlePrefValue) { - this.imapIdle.checked = true; + pub.imapIdle.checked = true; } else { - this.imapIdle.checked = false; + pub.imapIdle.checked = false; } // Select last accessed folder. // default: false - if (!this.prefs.getBoolPref(this.prefBranch + 'startup_folder')) { - this.startupFolder.checked = false; + if (!pub.prefs.getBoolPref(pub.prefBranch + 'startup_folder')) { + pub.startupFolder.checked = false; } else { - this.startupFolder.checked = true; + pub.startupFolder.checked = true; } // Time zone settings. // default: true - if (this.prefs.getBoolPref(this.prefBranch + 'timezone')) { - this.timezone.checked = false; + if (pub.prefs.getBoolPref(pub.prefBranch + 'timezone')) { + pub.timezone.checked = false; } else { - this.timezone.checked = true; + pub.timezone.checked = true; } // Fetch all messages for all accounts. // default: false - if (this.prefs.getBoolPref(this.prefBranch + 'fetchall')) { - this.fetchAllMails.checked = true; + if (pub.prefs.getBoolPref(pub.prefBranch + 'fetchall')) { + pub.fetchAllMails.checked = true; } else { - this.fetchAllMails.checked = false; + pub.fetchAllMails.checked = false; } // Enigmal settings // --throw-keyids - default: false - if (this.prefs.getBoolPref(this.prefBranch + 'enigmail.throwkeyid')) { - this.enigmailKeyId.checked = true; + if (pub.prefs.getBoolPref(pub.prefBranch + 'enigmail.throwkeyid')) { + pub.enigmailKeyId.checked = true; } else { - this.enigmailKeyId.checked = false; + pub.enigmailKeyId.checked = false; } // Confirm before sending - default: false - if (this.prefs.getBoolPref(this.prefBranch + 'enigmail.confirmemail')) { - this.enigmailConfirmEmail.checked = true; + if (pub.prefs.getBoolPref(pub.prefBranch + 'enigmail.confirmemail')) { + pub.enigmailConfirmEmail.checked = true; } else { - this.enigmailConfirmEmail.checked = false; + pub.enigmailConfirmEmail.checked = false; } // Keyserver. - var enigmailKeyserver = this.customBranch + 'extensions.enigmail.keyserver'; - if (this.prefs.prefHasUserValue(enigmailKeyserver)) { - this.enigmailKeyserver.value = this.prefs.getCharPref(enigmailKeyserver); + var enigmailKeyserver = pub.customBranch + 'extensions.enigmail.keyserver'; + if (pub.prefs.prefHasUserValue(enigmailKeyserver)) { + pub.enigmailKeyserver.value = pub.prefs.getCharPref(enigmailKeyserver); } else { - this.enigmailKeyserver.value = this.prefs.getCharPref('extensions.enigmail.keyserver'); + pub.enigmailKeyserver.value = pub.prefs.getCharPref('extensions.enigmail.keyserver'); } // Thunderbird's email wizard - default: false - if (this.prefs.getBoolPref(this.prefBranch + 'emailwizard')) { - this.emailWizard.checked = true; + if (pub.prefs.getBoolPref(pub.prefBranch + 'emailwizard')) { + pub.emailWizard.checked = true; } else { - this.emailWizard.checked = false; + pub.emailWizard.checked = false; } /* Security */ // Allow insecure renegotiation - default: false - if (this.prefs.prefHasUserValue(this.customBranch + 'security.ssl.require_safe_negotiation')) { - this.secureRenegotiation.checked = true; + if (pub.prefs.prefHasUserValue(pub.customBranch + 'security.ssl.require_safe_negotiation')) { + pub.secureRenegotiation.checked = true; } else { - this.secureRenegotiation.checked = false; + pub.secureRenegotiation.checked = false; } // Load the email accounts. - var accounts = this.getAccount(); + var accounts = pub.getAccount(); if (accounts.length !== 0) { - this.mailAccount.appendItem('...', 'select-account'); + pub.mailAccount.appendItem('...', 'select-account'); for (var i = 0; i < accounts.length; i++) { - this.mailAccount.appendItem(accounts[i].prettyName, accounts[i].key, accounts[i].type.toUpperCase()); + pub.mailAccount.appendItem(accounts[i].prettyName, accounts[i].key, accounts[i].type.toUpperCase()); } - this.mailAccount.selectedIndex = 0; + pub.mailAccount.selectedIndex = 0; } else { - this.mailAccount.disabled = true; - this.mailAccount.appendItem('No email accounts found'); - this.mailAccount.selectedIndex = 0; + pub.mailAccount.disabled = true; + pub.mailAccount.appendItem('No email accounts found'); + pub.mailAccount.selectedIndex = 0; } - }, + }; - displayTestPage: function(service) { + pub.displayTestPage = function(service) { Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator). getMostRecentWindow("mail:3pane"). document.getElementById("tabmail"). openTab("contentTab", {contentPage: service}); - }, + }; - testSettings: function() { - this.onAccept(); - var index = this.anonService.selectedIndex; - var anonCustomService = this.anonCustomService.selectedIndex; + pub.testSettings = function() { + pub.onAccept(); + var index = pub.anonService.selectedIndex; + var anonCustomService = pub.anonCustomService.selectedIndex; if ((index === 1) && (anonCustomService === 0 || typeof anonCustomService === "undefined")) { // Use "http://ip-check.info/tb.php?lang=en" for JonDo. - this.displayTestPage("https://ip-check.info/tb.php?lang=en"); + pub.displayTestPage("https://ip-check.info/tb.php?lang=en"); } else { - this.displayTestPage("https://check.torproject.org/"); + pub.displayTestPage("https://check.torproject.org/"); } - }, + }; - restoreDefaults: function() { + pub.restoreDefaults = function() { // Set the values to their default state. - this.anonService.selectedIndex = 0; - this.timezone.checked = false; - this.enigmailKeyId.checked = false; - this.enigmailConfirmEmail.checked = false; - this.emailWizard.checked = false; - this.secureRenegotiation.checked = false; - this.imapIdle.checked = false; - this.startupFolder.checked = false; - this.fetchAllMails.checked = false; + pub.anonService.selectedIndex = 0; + pub.timezone.checked = false; + pub.enigmailKeyId.checked = false; + pub.enigmailConfirmEmail.checked = false; + pub.emailWizard.checked = false; + pub.secureRenegotiation.checked = false; + pub.imapIdle.checked = false; + pub.startupFolder.checked = false; + pub.fetchAllMails.checked = false; // Save the settings and close the window. - this.checkSetting(); - this.onAccept(); - } + pub.checkSetting(); + pub.onAccept(); + }; + return pub; };

1 0

[torbirdy/master] Update emailwizard.js
by sukhbir＠torproject.org 12 Sep '13

12 Sep '13

commit 9fc56e84ea55b997b6243ca3ca4fd0ad56650133 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Sep 12 00:39:13 2013 -0400 Update emailwizard.js --- chrome/content/emailwizard.js | 66 ++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 8126f23..d4b2c3a 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -1,13 +1,28 @@ if (!org) var org = {}; if (!org.torbirdy) org.torbirdy = {}; -if (!org.torbirdy.emailwizard) org.torbirdy.emailwizard = { - - prefs: Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch), +if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { + var pub = {}; + + var prefs = Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefBranch); + + // Check if we are running Tails. If yes, disable the manual account + // configuration wizard since Tails handles that on its own. See: + // https://tails.boum.org/todo/Return_of_Icedove__63__/#index6h2 + // This is also disabled if "extensions.torbirdy.emailwizard" is true. + var disableWizard = false; + if (prefs.prefHasUserValue("vendor.name")) { + if (prefs.getCharPref("vendor.name") === "Tails") { + disableWizard = true; + } + } + if (prefs.getBoolPref("extensions.torbirdy.emailwizard")) { + disableWizard = true; + } - disableAutoWizard: function() { - if (!this.disableWizard) { + pub.disableAutoWizard = function() { + if (!disableWizard) { var realname = document.getElementById("realname").value; var email = document.getElementById("email").value; var password = document.getElementById("password").value; @@ -66,7 +81,7 @@ if (!org.torbirdy.emailwizard) org.torbirdy.emailwizard = { var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; var serverkey = newAccount.incomingServer.key; var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); - this.prefs.setBoolPref(checkNewMailPref, false); + prefs.setBoolPref(checkNewMailPref, false); // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup(). var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"] @@ -86,43 +101,34 @@ if (!org.torbirdy.emailwizard) org.torbirdy.emailwizard = { else { gEmailConfigWizard.onNext(); } - }, + }; - onKeyEnter: function(event) { + pub.onKeyEnter = function(event) { var keycode = event.keyCode; if (keycode == 13) { if (document.getElementById("next_button").disabled === false) { - if (!this.disableWizard) { - this.disableAutoWizard(); + if (!disableWizard) { + pub.disableAutoWizard(); } else { gEmailConfigWizard.onNext(); } } } - }, - - onLoad: function() { - // Check if we are running Tails. If yes, disable the manual account - // configuration wizard since Tails handles that on its own. See: - // https://tails.boum.org/todo/Return_of_Icedove__63__/#index6h2 - // This is also disabled if "extensions.torbirdy.emailwizard" is true. - this.disableWizard = false; - if (this.prefs.prefHasUserValue("vendor.name")) { - if (this.prefs.getCharPref("vendor.name") === "Tails") { - this.disableWizard = true; - } - } - if (this.prefs.getBoolPref("extensions.torbirdy.emailwizard")) { - this.disableWizard = true; - } + }; - document.getElementById("provisioner_button").disabled = true; - if (this.disableWizard) { + pub.onLoad = function() { + if (disableWizard) { document.getElementById("torbirdy-protocol-box").collapsed = true; + document.getElementById("provisioner_button").disabled = false; + document.getElementById("provisioner_button").hidden = false; + } else { + document.getElementById("provisioner_button").disabled = true; + document.getElementById("provisioner_button").hidden = true; } - } + }; + return pub; }; window.addEventListener("keypress", org.torbirdy.emailwizard.onKeyEnter, true);

1 0

r26351: {website} update our mailing address. (in website/trunk: about/en donate/en)
by Andrew Lewman 12 Sep '13

12 Sep '13

Author: phobos Date: 2013-09-12 03:47:41 +0000 (Thu, 12 Sep 2013) New Revision: 26351 Modified: website/trunk/about/en/corepeople.wml website/trunk/about/en/jobs-projectcoordinator.wml website/trunk/donate/en/donate.wml Log: update our mailing address. Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2013-09-11 11:14:30 UTC (rev 26350) +++ website/trunk/about/en/corepeople.wml 2013-09-12 03:47:41 UTC (rev 26351) @@ -15,8 +15,8 @@ <address> The Tor Project<br> - 969 Main Street, Suite 206<br> - Walpole, MA 02081-2972 USA<br><br> + 7 Temple Street, Suite A<br> + Cambridge, MA 02139-2403 USA<br><br> </address> <p>The organization consists of many volunteers and a few employees. Modified: website/trunk/about/en/jobs-projectcoordinator.wml =================================================================== --- website/trunk/about/en/jobs-projectcoordinator.wml 2013-09-11 11:14:30 UTC (rev 26350) +++ website/trunk/about/en/jobs-projectcoordinator.wml 2013-09-12 03:47:41 UTC (rev 26351) @@ -68,7 +68,7 @@ <p>Other notes:</p> <ul> -<li>Tor has an office in Walpole, MA. However, you can work from +<li>Tor has an office in Cambridge, MA. However, you can work from wherever you want, in basically any country. You'll need to be comfortable in this environment! We coordinate via IRC, Instant Messaging, email, phone and video chats, and bug trackers.</li> Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2013-09-11 11:14:30 UTC (rev 26350) +++ website/trunk/donate/en/donate.wml 2013-09-12 03:47:41 UTC (rev 26351) @@ -184,8 +184,8 @@ <h3>Donate via Check, Cash, Money Order, Bank Transfer</h3> <h4>You can send checks or money orders to:</h4> <p>The Tor Project, Inc<br> - 969 Main Street, Suite 206<br> - Walpole, MA 02081-2972 USA</p> + 7 Temple Street, Suite A<br> + Cambridge, MA 02139-2403 USA</p>   <h3 style="margin-top:20px;">Donate via Wire or Bank Transfer</h3>

1 0