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

[translation/orbot] Update translations for orbot
by translation＠torproject.org 14 Aug '13

14 Aug '13

commit 57cc82ee83a50640017efa94df77d6ecbb1eb502 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 14 04:45:12 2013 +0000 Update translations for orbot --- values-ar/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index d6c2422..5d46cdb 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -24,7 +24,7 @@ <string name="menu_start">بدء</string> <string name="menu_stop">توقف</string> <string name="menu_about">حول</string> - <string name="menu_wizard">Wizard</string> + <string name="menu_wizard">معالج</string> <string name="main_layout_download">تحميل</string> <string name="main_layout_upload">رفع</string> <string name="button_help">مساعدة</string>

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 14 Aug '13

14 Aug '13

commit 4c19b69d5d9d2e92a0082bc587769b98898ad984 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 14 01:46:03 2013 +0000 Update translations for whisperback --- sk/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/sk.po b/sk/sk.po index 56fbdca..c75a76f 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-08-14 01:12+0000\n" +"PO-Revision-Date: 2013-08-14 01:20+0000\n" "Last-Translator: momoali <momoali007(a)googlemail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 14 Aug '13

14 Aug '13

commit 0ddb714ad33596dd981084ffbd8f5455070c9c5c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 14 01:16:05 2013 +0000 Update translations for whisperback --- sk/sk.po | 59 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index ebc96e0..56fbdca 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# momoali <momoali007(a)googlemail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2012-02-26 16:11+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2013-08-01 15:36+0200\n" +"PO-Revision-Date: 2013-08-14 01:12+0000\n" +"Last-Translator: momoali <momoali007(a)googlemail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "" +msgstr "Neplatný kontaktny email: %s" #: ../whisperBack/whisperback.py:80 #, python-format @@ -39,40 +40,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "" -#: ../whisperBack/gui.py:151 +#: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." -msgstr "" +msgstr "Nie je možné načítať validnú konfiguraciu." -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:220 msgid "Sending mail..." -msgstr "" +msgstr "Odosielam mail..." -#: ../whisperBack/gui.py:218 +#: ../whisperBack/gui.py:221 msgid "Sending mail" -msgstr "" +msgstr "Odosielam mail" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "" +msgstr "Toto môže biť na dlhšie..." -#: ../whisperBack/gui.py:234 +#: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." -msgstr "" +msgstr "Kontaktná emailová adresa sa nezdá but správna." -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error." msgstr "" -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:256 msgid "Unable to connect to the server." msgstr "" -#: ../whisperBack/gui.py:255 +#: ../whisperBack/gui.py:258 msgid "Unable to create or to send the mail." msgstr "" -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:261 msgid "" "\n" "\n" @@ -81,21 +82,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "" -#: ../whisperBack/gui.py:271 +#: ../whisperBack/gui.py:274 msgid "Your message has been sent." msgstr "" -#: ../whisperBack/gui.py:278 +#: ../whisperBack/gui.py:281 msgid "An error occured during encryption." msgstr "" -#: ../whisperBack/gui.py:298 +#: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." -msgstr "" +msgstr "Nie je možné uložiť %s." #. XXX: fix string -#: ../whisperBack/gui.py:322 +#: ../whisperBack/gui.py:325 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -105,27 +106,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "" -#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "" -#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "" -#: ../whisperBack/gui.py:390 +#: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "" -#: ../whisperBack/gui.py:391 +#: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" msgstr "" -#: ../whisperBack/gui.py:392 +#: ../whisperBack/gui.py:395 msgid "translator-credits" msgstr "" -#: ../whisperBack/gui.py:419 +#: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr ""

1 0

[torspec/master] 220-ecc-id-keys: fix gaps noted by Sebastian G
by nickm＠torproject.org 14 Aug '13

14 Aug '13

commit 5380544e8e30408c30c057a3f4b8157815b0a059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 13 21:12:02 2013 -0400 220-ecc-id-keys: fix gaps noted by Sebastian G --- proposals/220-ecc-id-keys.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index 1c112b9..ebbc3b5 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -188,7 +188,7 @@ Status: Draft currently check. * If the identity-ed25519 line is present, it must be well-formed, and the certificate must be well-formed and correctly signed, - and there must be a valid. + and there must be a valid router-signature-ed25519 signature. * If we require an ed25519 key for this node (see 3.1 below), the ed25519 key must be present. @@ -467,14 +467,17 @@ Status: Draft When we need to indicate an Ed25519 identity key in an hostname format (as in a .exit address), we use the lowercased version of the - name, and perform a case-insensitive match. (This loses us one bit - per byte of name, + name, and perform a case-insensitive match. (This loses us a little + less than one bit per byte of name, leaving plenty of bits to make + sure we choose the right node.) - Nodes must not list Ed25519 identities in their family lines; clients - and authorities must not honor them there. + Nodes must not list Ed25519 identities in their family lines; clients and + authorities must not honor them there. (Doing so would make different + clients change paths differently in a possibly manipulatable way.) Clients shouldn't accept .exit addresses with Ed25519 names on SOCKS - or DNS ports by default, even when AllowDotExit is set. + or DNS ports by default, even when AllowDotExit is set. We can add + another option for the later if there's a good reason to have this. We need an identity-to-node map for ECC identity and for RSA identity. @@ -515,4 +518,3 @@ Status: Draft * Ed25519 support for hidden services * Bridge identity support. * Ed25519-aware family support - *

1 0

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

13 Aug '13

commit 6b9c164818655b935a9b0482c7420796788fa147 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 13 19:46:18 2013 +0000 Update translations for liveusb-creator --- pt/pt.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 6384675..45a32ff 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-13 19:10+0000\n" +"PO-Revision-Date: 2013-08-13 19:30+0000\n" "Last-Translator: SonhosDigitais <sonhosdigitais(a)gmx.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/T #: ../liveusb/dialog.py:154 msgid "Alt+B" -msgstr "" +msgstr "Alt+B" #: ../liveusb/dialog.py:153 msgid "Browse" @@ -126,7 +126,7 @@ msgstr "A criar %sMB para área persistente..." #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "O dispositivo não está montado, não é possível determinar a quantidade de espaço disponível." #: ../liveusb/dialog.py:157 #, python-format @@ -355,19 +355,19 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "" +msgstr "Este botão vai iniciar o processo de criação da pen USB. O processo envolve o download, opcional, de uma versão (se nenhuma, existente no seu pc, tiver sido escolhida), seguido da extracção da ISO para o dispositivo USB, criar o armazenamento permanente e instalar o bootloader." #: ../liveusb/dialog.py:158 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "Esta é a pen USB onde quer instalar o seu sistema Live. O dispositivo tem de ser formatado como FAT." #: ../liveusb/dialog.py:163 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "Esta é a barra de progresso que indica o estado " #: ../liveusb/dialog.py:162 msgid "This is the status console, where all messages get written to." @@ -489,11 +489,11 @@ msgstr "Sistema de ficheiros não suportado: %s\nPor favor, faça um backup e fo #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" -msgstr "" +msgstr "Faça a actualização a partir da ISO" #: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" -msgstr "" +msgstr "Use a ISO do sistema Live instalado" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" @@ -561,4 +561,4 @@ msgstr "O seu dispositivo já contém um LiveOS.\nCaso continue, este será apag #: ../liveusb/dialog.py:155 msgid "or" -msgstr "" +msgstr "ou"

1 0

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

13 Aug '13

commit 6b69cd49fc7091ef74a7b8cf913c0842bcafdea1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 13 19:16:19 2013 +0000 Update translations for liveusb-creator --- pt/pt.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index b4b5a7d..6384675 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-08 09:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-08-13 19:10+0000\n" +"Last-Translator: SonhosDigitais <sonhosdigitais(a)gmx.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +68,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails USB stick from a new ISO image.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">⏎\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">⏎\np, li { white-space: pre-wrap; }⏎\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">⏎\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Faça o upgrade do Tails USB stick instalado, a partir de uma nova imagem ISO.</span></p></body></html>" #: ../liveusb/dialog.py:154 msgid "Alt+B" @@ -84,7 +84,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "" +msgstr "Ao reservar espaço extra para armazenamento persistente, na pen USB, poderá guardar dados e fazer modificações permanentes no seu sistema. Sem isso será incapaz de guardar dados após o reiniciar do sistema." #: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format @@ -121,7 +121,7 @@ msgstr "Criar o Live USB" #: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "A criar %sMb para área persistente..." +msgstr "A criar %sMB para área persistente..." #: ../liveusb/gui.py:556 msgid "" @@ -192,7 +192,7 @@ msgstr "A verificação de checksum MD5, do ISO, falhou" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "" +msgstr "Se não selecionar nenhum Live ISO, a versão escolhida será a descarregada." #: ../liveusb/gui.py:619 msgid "Installation complete!" @@ -205,7 +205,7 @@ msgstr "Instalação terminada! (%s)" #: ../liveusb/gui.py:620 msgid "Installation was completed. Press OK to close this program." -msgstr "A instalação está terminada. Carregue em OK para fechar o programa." +msgstr "A instalação terminou. Carregue em OK para fechar o programa." #: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 msgid "Installing bootloader..." @@ -271,7 +271,7 @@ msgstr "Armazenamento persistente (0 MB)" #: ../liveusb/gui.py:679 ../liveusb/gui.py:696 msgid "Press 'Next' if you wish to continue." -msgstr "Carregue em 'Próximo' se quiser continuar." +msgstr "Carregue em 'Próximo' para continuar." #: ../liveusb/gui.py:456 msgid "Refreshing releases..." @@ -297,7 +297,7 @@ msgstr "A fazer o reset do Master Boot Record de %s" #: ../liveusb/gui.py:761 msgid "Select Live ISO" -msgstr "Seleccione um ficheiro ISO com um sistema Live" +msgstr "Seleccione um ficheiro ISO com o sistema Live" #: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." @@ -547,7 +547,7 @@ msgstr "A versão do syslinux-extlinux que está a usar é antiga e não suporta #: ../liveusb/gui.py:755 msgid "You can try again to resume your download" -msgstr "Pode tentar retomar, novamente, a transferência" +msgstr "Pode tentar retomar a transferência" #: ../liveusb/creator.py:92 msgid "You must run this application as root" @@ -557,7 +557,7 @@ msgstr "Precisa de executar esta aplicação como root" msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "O seu dispositivo já contém um LiveOS.\nCaso continue, este será escrito por cima." +msgstr "O seu dispositivo já contém um LiveOS.\nCaso continue, este será apagado." #: ../liveusb/dialog.py:155 msgid "or"

1 0

[torbirdy/master] Fix the TB_ID variable
by sukhbir＠torproject.org 13 Aug '13

13 Aug '13

commit b720f9c3af2a99d2f4672d3a5dbb12c5fcd6abf8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 13 14:44:35 2013 -0400 Fix the TB_ID variable --- components/torbirdy.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 1deefb3..85293bb 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -7,7 +7,8 @@ const Cr = Components.results; const SERVICE_CTRID = "@torproject.org/torbirdy;1"; const SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); const SERVICE_NAME = "Main TorBirdy Component"; -const tb_ID = "castironthunderbirdclub(a)torproject.org"; + +const TB_ID = "castironthunderbirdclub(a)torproject.org"; const kPrefBranch = "extensions.torbirdy.custom."; const kRestoreBranch = "extensions.torbirdy.restore."; @@ -353,7 +354,7 @@ TorBirdy.prototype = { _xpcom_categories: [{ category: "profile-after-change"}, ], onUninstalling: function(addon, needsRestart) { - if (addon.id == tb_ID) { + if (addon.id == TB_ID) { dump("Nooo! TorBirdy uninstall requested\n"); this._uninstall = true; this.resetUserPrefs(); @@ -361,7 +362,7 @@ TorBirdy.prototype = { }, onOperationCancelled: function(addon) { - if (addon.id == tb_ID) { + if (addon.id == TB_ID) { dump("Uninstall requested cancelled. Yayay!\n"); this._uninstall = false; this.setPrefs(); @@ -372,7 +373,7 @@ TorBirdy.prototype = { if (topic == "em-action-requested") { subject.QueryInterface(Ci.nsIUpdateItem); - if (subject.id == tb_ID) { + if (subject.id == TB_ID) { if (data == "item-uninstalled" || data == "item-disabled") { dump("Nooo! TorBirdy uninstall requested\n"); this._uninstall = true;

1 0

[torbirdy/master] Better indentation and fix typos
by sukhbir＠torproject.org 13 Aug '13

13 Aug '13

commit 30715f7965030cd0905166aa86b02abaea388145 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 13 14:42:13 2013 -0400 Better indentation and fix typos --- components/torbirdy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 8fc413d..1deefb3 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -4,10 +4,10 @@ const Ci = Components.interfaces; const Cc = Components.classes; const Cr = Components.results; -const SERVICE_CTRID = "@torproject.org/torbirdy;1"; -const SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); -const SERVICE_NAME = "Main TorBirdy component"; -const tb_ID = "castironthunderbirdclub(a)torproject.org"; +const SERVICE_CTRID = "@torproject.org/torbirdy;1"; +const SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); +const SERVICE_NAME = "Main TorBirdy Component"; +const tb_ID = "castironthunderbirdclub(a)torproject.org"; const kPrefBranch = "extensions.torbirdy.custom."; const kRestoreBranch = "extensions.torbirdy.restore.";

1 0

[torbirdy/master] Improve variable names
by sukhbir＠torproject.org 13 Aug '13

13 Aug '13

commit 3fbfa11225c8d79c9cba4594ff89daee6e858ab6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 13 14:40:20 2013 -0400 Improve variable names --- components/torbirdy.js | 73 ++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 4faf60f..8fc413d 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -7,10 +7,11 @@ const Cr = Components.results; const SERVICE_CTRID = "@torproject.org/torbirdy;1"; const SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); const SERVICE_NAME = "Main TorBirdy component"; -const TORBIRDY_ID = "castironthunderbirdclub(a)torproject.org"; -const PREF_BRANCH = "extensions.torbirdy.custom."; -const RESTORE_BRANCH = "extensions.torbirdy.restore."; -const TORBIRDY_BRANCH = "extensions.torbirdy."; +const tb_ID = "castironthunderbirdclub(a)torproject.org"; + +const kPrefBranch = "extensions.torbirdy.custom."; +const kRestoreBranch = "extensions.torbirdy.restore."; +const kTorBirdyBranch = "extensions.torbirdy."; // Default preference values for TorBirdy. // These preferences values will be "enforced": even if the user decides to @@ -21,7 +22,7 @@ const TORBIRDY_BRANCH = "extensions.torbirdy."; // the secure default when Thunderbird starts. // There are some preferences that can be overwritten using TorBirdy's // preferences dialog. See `preferences.js'. -const TORBIRDYPREFS = { +const TorBirdyPrefs = { "extensions.torbirdy.protected": false, // When the preferences below have been set, then only enable TorBirdy. // Generate our own custom time-independent message-ID. @@ -276,7 +277,7 @@ const TORBIRDYPREFS = { // when TorBirdy is initialized that should be preserved instead. When TorBirdy // is disabled or uninstalled, these preferences are restored to their original // value. All such preferences go here. -const TORBIRDY_OLDPREFS = [ +const TorBirdyOldPrefs = [ "network.proxy.type", "network.proxy.ssl_port", "network.proxy.ssl", @@ -295,11 +296,11 @@ function TorBirdy() { .getService(Ci.nsIPrefBranch); var torbirdyPref = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefService).getBranch(PREF_BRANCH); + .getService(Ci.nsIPrefService).getBranch(kPrefBranch); this.customPrefs = torbirdyPref.getChildList("", {}); var oldPrefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefService).getBranch(RESTORE_BRANCH); + .getService(Ci.nsIPrefService).getBranch(kRestoreBranch); this.restorePrefs = oldPrefs.getChildList("", {}); this.acctMgr = Cc["@mozilla.org/messenger/account-manager;1"] @@ -352,7 +353,7 @@ TorBirdy.prototype = { _xpcom_categories: [{ category: "profile-after-change"}, ], onUninstalling: function(addon, needsRestart) { - if (addon.id == TORBIRDY_ID) { + if (addon.id == tb_ID) { dump("Nooo! TorBirdy uninstall requested\n"); this._uninstall = true; this.resetUserPrefs(); @@ -360,7 +361,7 @@ TorBirdy.prototype = { }, onOperationCancelled: function(addon) { - if (addon.id == TORBIRDY_ID) { + if (addon.id == tb_ID) { dump("Uninstall requested cancelled. Yayay!\n"); this._uninstall = false; this.setPrefs(); @@ -371,7 +372,7 @@ TorBirdy.prototype = { if (topic == "em-action-requested") { subject.QueryInterface(Ci.nsIUpdateItem); - if (subject.id == TORBIRDY_ID) { + if (subject.id == tb_ID) { if (data == "item-uninstalled" || data == "item-disabled") { dump("Nooo! TorBirdy uninstall requested\n"); this._uninstall = true; @@ -388,15 +389,15 @@ TorBirdy.prototype = { resetUserPrefs: function() { dump("Resetting user preferences to default\n"); // Clear the Thunderbird preferences we changed. - for (var each in TORBIRDYPREFS) { + for (var each in TorBirdyPrefs) { this.prefs.clearUserPref(each); } // Restore the older proxy preferences that were set before TorBirdy. dump("Restoring proxy settings\n"); - for (var i = 0; i < TORBIRDY_OLDPREFS.length; i++) { - var oldPref = TORBIRDY_OLDPREFS[i]; - var setValue = RESTORE_BRANCH + oldPref; + for (var i = 0; i < TorBirdyOldPrefs.length; i++) { + var oldPref = TorBirdyOldPrefs[i]; + var setValue = kRestoreBranch + oldPref; var type = this.prefs.getPrefType(setValue); if (type === 32) { this.prefs.setCharPref(oldPref, this.prefs.getCharPref(setValue)); @@ -418,7 +419,7 @@ TorBirdy.prototype = { var clearPrefs = Cc["@mozilla.org/preferences-service;1"] .getService(Ci.nsIPrefService).getBranch(TORBIRDY_BRANCH).getChildList("", {}); for (var i = 0; i < clearPrefs.length; i++) { - this.prefs.clearUserPref(TORBIRDY_BRANCH + clearPrefs[i]); + this.prefs.clearUserPref(kTorBirdyBranch + clearPrefs[i]); } }, @@ -429,28 +430,28 @@ TorBirdy.prototype = { var typePref = this.prefs.getPrefType(this.customPrefs[i]); // String. if (typePref === 32) { - var value = this.prefs.getCharPref(PREF_BRANCH + this.customPrefs[i]); + var value = this.prefs.getCharPref(kPrefBranch + this.customPrefs[i]); } // Int. if (typePref === 64) { - var value = this.prefs.getIntPref(PREF_BRANCH + this.customPrefs[i]); + var value = this.prefs.getIntPref(kPrefBranch + this.customPrefs[i]); } // Bool. if (typePref === 128) { - var value = this.prefs.getBoolPref(PREF_BRANCH + this.customPrefs[i]); + var value = this.prefs.getBoolPref(kPrefBranch + this.customPrefs[i]); } - TORBIRDYPREFS[this.customPrefs[i]] = value; + TorBirdyPrefs[this.customPrefs[i]] = value; } - for (var each in TORBIRDYPREFS) { - if (typeof TORBIRDYPREFS[each] === "boolean") { - this.prefs.setBoolPref(each, TORBIRDYPREFS[each]); + for (var each in TorBirdyPrefs) { + if (typeof TorBirdyPrefs[each] === "boolean") { + this.prefs.setBoolPref(each, TorBirdyPrefs[each]); } - if (typeof TORBIRDYPREFS[each] === "number") { - this.prefs.setIntPref(each, TORBIRDYPREFS[each]); + if (typeof TorBirdyPrefs[each] === "number") { + this.prefs.setIntPref(each, TorBirdyPrefs[each]); } - if (typeof TORBIRDYPREFS[each] === "string") { - this.prefs.setCharPref(each, TORBIRDYPREFS[each]); + if (typeof TorBirdyPrefs[each] === "string") { + this.prefs.setCharPref(each, TorBirdyPrefs[each]); } } }, @@ -458,29 +459,29 @@ TorBirdy.prototype = { setAccountPrefs: function() { if (this.prefs.getBoolPref("extensions.torbirdy.first_run")) { // Save the current proxy settings so that the settings can be restored in case - // TorBirdy is uninstalled or disabled. (TORBIRDY_OLDPREFS) - for (var i = 0; i < TORBIRDY_OLDPREFS.length; i++) { - var oldPref = TORBIRDY_OLDPREFS[i]; + // TorBirdy is uninstalled or disabled. (TorBirdyOldPrefs) + for (var i = 0; i < TorBirdyOldPrefs.length; i++) { + var oldPref = TorBirdyOldPrefs[i]; var type = this.prefs.getPrefType(oldPref); // String. if (type === 32) { if (this.prefs.prefHasUserValue(oldPref)) { var pref = this.prefs.getCharPref(oldPref); - this.prefs.setCharPref(RESTORE_BRANCH + oldPref, pref); + this.prefs.setCharPref(kRestoreBranch + oldPref, pref); } } // Int. if (type === 64) { if (this.prefs.prefHasUserValue(oldPref)) { var pref = this.prefs.getIntPref(oldPref); - this.prefs.setIntPref(RESTORE_BRANCH + oldPref, pref); + this.prefs.setIntPref(kRestoreBranch + oldPref, pref); } } // Bool. if (type === 128) { if (this.prefs.prefHasUserValue(oldPref)) { var pref = this.prefs.getBoolPref(oldPref); - this.prefs.setBoolPref(RESTORE_BRANCH + oldPref, pref); + this.prefs.setBoolPref(kRestoreBranch + oldPref, pref); } } } @@ -517,13 +518,13 @@ TorBirdy.prototype = { var typePref = this.prefs.getPrefType(prefToCall); if (typePref === 64) { var currentPref = this.prefs.getIntPref(prefToCall); - this.prefs.setIntPref(RESTORE_BRANCH + prefToCall, currentPref); + this.prefs.setIntPref(kRestoreBranch + prefToCall, currentPref); } if (typePref === 128) { var currentPref = this.prefs.getBoolPref(prefToCall); - this.prefs.setBoolPref(RESTORE_BRANCH + prefToCall, currentPref); + this.prefs.setBoolPref(kRestoreBranch + prefToCall, currentPref); } - TORBIRDY_OLDPREFS.push(prefToCall); + TorBirdyOldPrefs.push(prefToCall); } }

1 0

[torbirdy/master] Better indentation for overlay.js
by sukhbir＠torproject.org 13 Aug '13

13 Aug '13

commit 0913c9c7a3236568558b999b25185d382979a299 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 13 13:43:56 2013 -0400 Better indentation for overlay.js --- chrome/content/overlay.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js index 0e273ed..41e6684 100644 --- a/chrome/content/overlay.js +++ b/chrome/content/overlay.js @@ -28,8 +28,7 @@ function torbirdyStartup() { } // Set the time zone to UTC if the preference is true. - if (prefs.getBoolPref("extensions.torbirdy.timezone")) - { + if (prefs.getBoolPref("extensions.torbirdy.timezone")) { env.set('TZ', 'UTC'); } @@ -41,18 +40,18 @@ function torbirdyStartup() { var myPanel = document.getElementById("torbirdy-my-panel"); var strbundle = document.getElementById("torbirdy-strings-overlay"); - if (prefs.getBoolPref("extensions.torbirdy.protected")) - { + + // If all other preferences have been set in `components/torbirdy.js' + if (prefs.getBoolPref("extensions.torbirdy.protected")) { var type = prefs.getIntPref("extensions.torbirdy.proxy"); myPanel.style.color = "green"; + // Tor. - if (type === 0) - { + if (type === 0) { myPanel.label = strbundle.getString("torbirdy.enabled.tor"); } // JonDo/Whonix. - if (type === 1) - { + if (type === 1) { if (prefs.getIntPref("extensions.torbirdy.proxy.type") === 0) { myPanel.label = strbundle.getString("torbirdy.enabled.jondo"); } @@ -61,8 +60,7 @@ function torbirdyStartup() { } } // Custom. - if (type === 2) - { + if (type === 2) { myPanel.label = strbundle.getString("torbirdy.enabled.custom"); } // Whonix. @@ -71,13 +69,13 @@ function torbirdyStartup() { org.torbirdy.prefs.setProxyWhonix(); } // Transparent Torification. - if (type === 3) - { + if (type === 3) { myPanel.label = strbundle.getString("torbirdy.enabled.torification"); myPanel.style.color = "red"; } prefs.setBoolPref("extensions.torbirdy.whonix_run", false); - } else { + } + else { myPanel.label = strbundle.getString("torbirdy.enabled.disabled"); myPanel.style.color = "red"; }

1 0