May 2015 - tor-commits - lists.torproject.org

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 10 May '15

10 May '15

commit 35c12a63d64ceacf8c927dab5807c3da57ff4b83 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 10 18:45:08 2015 +0000 Update translations for bridgedb_completed --- hu/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index 8217c6e..3443833 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-05-10 18:13+0000\n" +"PO-Revision-Date: 2015-05-10 18:22+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 May '15

10 May '15

commit 86e37b77200f7d4060dab4aab2bdfe18e26f06cc Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 10 18:45:04 2015 +0000 Update translations for bridgedb --- hu/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index 8217c6e..3443833 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-05-10 18:13+0000\n" +"PO-Revision-Date: 2015-05-10 18:22+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n"

1 0

[tor-messenger-build/master] Improve the patch for #13855 (known onions for XMPP servers)
by sukhbir＠torproject.org 10 May '15

10 May '15

commit 8d9d6c3aab4dd3aa2b7de6addbdcf6fb9a8716a9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun May 10 14:34:24 2015 -0400 Improve the patch for #13855 (known onions for XMPP servers) - Separate the patches for JS, XUL and locale files - Be more verbose that we are are forcing the use of onion addresses for known XMPP servers in accountWizard.js --- projects/instantbird/config | 6 +- projects/instantbird/xmpp-onion-js.patch | 85 ++++++++++++++++++++ projects/instantbird/xmpp-onion-locale.patch | 10 +++ projects/instantbird/xmpp-onion-xul.patch | 31 ++++++++ projects/instantbird/xmpp-onion.patch | 107 -------------------------- 5 files changed, 130 insertions(+), 109 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 38a3deb..af90ba1 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,9 +69,11 @@ input_files: - filename: cert_override.txt - filename: ctcp-time.patch - filename: ctcp-ping.patch - - filename: xmpp-onion.patch - - filename: xmpp-resource.patch - filename: xmpp-domain.patch + - filename: xmpp-resource.patch + - filename: xmpp-onion-js.patch + - filename: xmpp-onion-xul.patch + - filename: xmpp-onion-locale.patch - filename: xmpp-username-split.patch - filename: version.patch - filename: branding/name.patch diff --git a/projects/instantbird/xmpp-onion-js.patch b/projects/instantbird/xmpp-onion-js.patch new file mode 100644 index 0000000..54339ac --- /dev/null +++ b/projects/instantbird/xmpp-onion-js.patch @@ -0,0 +1,85 @@ +diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js +index 707f1c7..2ca929a 100644 +--- a/im/content/accountWizard.js ++++ b/im/content/accountWizard.js +@@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm"); + + const PREF_EXTENSIONS_GETMOREPROTOCOLSURL = "extensions.getMoreProtocolsURL"; + ++// Borrowed and inspired by xmpp-client. ++const kServerOnions = { ++ "riseup.net": "4cjw6cwpeaeppfqz.onion", ++ "jabber.ccc.de": "okj7xc6j2szr2y75.onion", ++ "jabber.otr.im": "5rgdtlawqkcplz75.onion", ++ "jabber.calyxinstitute.org": "ijeeynrc6x2uy5ob.onion", ++} ++ + var accountWizard = { + onload: function aw_onload() { + let topProtoList = document.getElementById("topprotolist"); +@@ -105,6 +113,21 @@ var accountWizard = { + return textbox; + }, + ++ insertOnionAddress: function aw_insertOnionAddress() { ++ // Currently, we only use onion addresses for XMPP. ++ if (this.proto.id == "prpl-jabber") { ++ // If the value of the domain is one for which there exists a ++ // hidden service, replace the address with the onion address. ++ this.jabberDomain = document.getElementById("username-split-0"); ++ if (this.jabberDomain.value in kServerOnions) { ++ this.onionAddress = kServerOnions[this.jabberDomain.value]; ++ } ++ else { ++ this.onionAddress = ""; ++ } ++ } ++ }, ++ + showUsernamePage: function aw_showUsernamePage() { + let proto = this.proto.id; + if ("userNameBoxes" in this && this.userNameProto == proto) { +@@ -160,11 +183,20 @@ var accountWizard = { + document.getElementById("accountusername").next = next; + }, + ++ setOnionAddress: function aw_setOnionAddress() { ++ if (this.proto.id == "prpl-jabber") { ++ document.getElementById("prpl-jabber-server").value = this.onionAddress; ++ } ++ }, ++ + showAdvanced: function aw_showAdvanced() { + // ensure we don't destroy user data if it's not necessary + let id = this.proto.id; +- if ("protoSpecOptId" in this && this.protoSpecOptId == id) ++ if ("protoSpecOptId" in this && this.protoSpecOptId == id) { ++ // But we should still set the onion address, if it exists. ++ this.setOnionAddress(); + return; ++ } + this.protoSpecOptId = id; + + /* FIXME +@@ -172,6 +204,7 @@ var accountWizard = { + !this.proto.newMailNotification; + */ + this.populateProtoSpecificBox(); ++ this.setOnionAddress(); + + let proxyVisible = this.proto.usePurpleProxy; + if (proxyVisible) { +@@ -407,6 +440,13 @@ var accountWizard = { + let label = bundle.getFormattedString("accountColon", [opt.opt.label]); + rows.appendChild(this.createSummaryRow(label, opt.value)); + } ++ ++ if (this.onionAddress) { ++ let onionLabel = document.getElementById("topProtocolsBundle"); ++ let onion = document.getElementById("onionAddress"); ++ onion.value = onionLabel.getFormattedString("onionAddress.label", ++ [this.jabberDomain.value, this.onionAddress]); ++ } + }, + + createAccount: function aw_createAccount() { diff --git a/projects/instantbird/xmpp-onion-locale.patch b/projects/instantbird/xmpp-onion-locale.patch new file mode 100644 index 0000000..a04fe94 --- /dev/null +++ b/projects/instantbird/xmpp-onion-locale.patch @@ -0,0 +1,10 @@ +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties +index 77dd6dd..7ee9bce 100644 +--- a/im/locales/en-US/chrome/instantbird/accountWizard.properties ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties +@@ -19,3 +19,5 @@ topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline + topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger + topProtocol.prpl-msn.description=Microsoft Windows Live Messenger (formerly MSN) + topProtocol.prpl-yahoo.description=Chat with friends using Yahoo! Messenger ++ ++onionAddress.label=We will secure your connection to %S by connecting to %S. diff --git a/projects/instantbird/xmpp-onion-xul.patch b/projects/instantbird/xmpp-onion-xul.patch new file mode 100644 index 0000000..9547d75 --- /dev/null +++ b/projects/instantbird/xmpp-onion-xul.patch @@ -0,0 +1,31 @@ +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +index 5fa5b82..d9ce335 100644 +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -59,7 +59,8 @@ + label="&accountUsernameTitle.label;" + onpageshow="accountWizard.showUsernamePage();" + onpagehide="accountWizard.hideUsernamePage();" +- onpagerewound="return accountWizard.rewindFromUsernamePage();"> ++ onpagerewound="return accountWizard.rewindFromUsernamePage();" ++ onpageadvanced="return accountWizard.insertOnionAddress();"> + <description id="usernameInfo"/> + <separator/> + <vbox id="userNameBox"/> +@@ -98,7 +99,7 @@ + <checkbox id="newMailNotification" + label="&accountAdvanced.newMailNotification.label;" hidden="true"/> + +- <groupbox id="protoSpecificGroupbox" class="collapsable" closed="true" ++ <groupbox id="protoSpecificGroupbox" class="collapsable" closed="false" + onkeypress="accountWizard.onGroupboxKeypress(event)"> + <caption id="protoSpecificCaption" + onclick="accountWizard.toggleGroupbox('protoSpecificGroupbox')"/> +@@ -137,6 +138,7 @@ + </columns> + <rows id="summaryRows"/> + </grid> ++ <description id="onionAddress" /> + <separator/> + <checkbox id="connectAutomatically" label= "&accountSummary.connectAutomatically.label;" checked="true"/> + </wizardpage> diff --git a/projects/instantbird/xmpp-onion.patch b/projects/instantbird/xmpp-onion.patch deleted file mode 100644 index 46a1a76..0000000 --- a/projects/instantbird/xmpp-onion.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 6bd2fc6cbc618e8fcd38411854da2527556e0114 Mon Sep 17 00:00:00 2001 -From: Sukhbir Singh <sukhbir(a)torproject.org> -Date: Fri, 8 May 2015 10:19:31 -0400 -Subject: [PATCH] Use onion addresses for known XMPP servers (#13855) - ---- - im/content/accountWizard.js | 35 ++++++++++++++++++++++++++++++++++- - im/content/accountWizard.xul | 5 +++-- - 2 files changed, 37 insertions(+), 3 deletions(-) - -diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 707f1c7..e763165 100644 ---- a/im/content/accountWizard.js -+++ b/im/content/accountWizard.js -@@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm"); - - const PREF_EXTENSIONS_GETMOREPROTOCOLSURL = "extensions.getMoreProtocolsURL"; - -+// Borrowed and inspired by xmpp-client. -+const kServerOnions = { -+ "riseup.net": "4cjw6cwpeaeppfqz.onion", -+ "jabber.ccc.de": "okj7xc6j2szr2y75.onion", -+ "jabber.otr.im": "5rgdtlawqkcplz75.onion", -+ "jabber.calyxinstitute.org": "ijeeynrc6x2uy5ob.onion", -+} -+ - var accountWizard = { - onload: function aw_onload() { - let topProtoList = document.getElementById("topprotolist"); -@@ -105,6 +113,21 @@ var accountWizard = { - return textbox; - }, - -+ insertOnionAddress: function aw_insertOnionAddress() { -+ // Currently, we only use onion addresses for XMPP. -+ if (this.proto.id == "prpl-jabber") { -+ // If the value of the domain is one for which there exists a -+ // hidden service, replace the address with the onion address. -+ let jabberDomain = document.getElementById("username-split-0"); -+ if (jabberDomain.value in kServerOnions) { -+ this.onionAddress = kServerOnions[jabberDomain.value]; -+ } -+ else { -+ this.onionAddress = ""; -+ } -+ } -+ }, -+ - showUsernamePage: function aw_showUsernamePage() { - let proto = this.proto.id; - if ("userNameBoxes" in this && this.userNameProto == proto) { -@@ -160,11 +183,20 @@ var accountWizard = { - document.getElementById("accountusername").next = next; - }, - -+ setOnionAddress: function aw_setOnionAddress() { -+ if (this.proto.id == "prpl-jabber") { -+ document.getElementById("prpl-jabber-server").value = this.onionAddress; -+ } -+ }, -+ - showAdvanced: function aw_showAdvanced() { - // ensure we don't destroy user data if it's not necessary - let id = this.proto.id; -- if ("protoSpecOptId" in this && this.protoSpecOptId == id) -+ if ("protoSpecOptId" in this && this.protoSpecOptId == id) { -+ // But we should still set the onion address, if it exists. -+ this.setOnionAddress(); - return; -+ } - this.protoSpecOptId = id; - - /* FIXME -@@ -172,6 +204,7 @@ var accountWizard = { - !this.proto.newMailNotification; - */ - this.populateProtoSpecificBox(); -+ this.setOnionAddress(); - - let proxyVisible = this.proto.usePurpleProxy; - if (proxyVisible) { -diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 5fa5b82..89f88fe 100644 ---- a/im/content/accountWizard.xul -+++ b/im/content/accountWizard.xul -@@ -59,7 +59,8 @@ - label="&accountUsernameTitle.label;" - onpageshow="accountWizard.showUsernamePage();" - onpagehide="accountWizard.hideUsernamePage();" -- onpagerewound="return accountWizard.rewindFromUsernamePage();"> -+ onpagerewound="return accountWizard.rewindFromUsernamePage();" -+ onpageadvanced="return accountWizard.insertOnionAddress();"> - <description id="usernameInfo"/> - <separator/> - <vbox id="userNameBox"/> -@@ -98,7 +99,7 @@ - <checkbox id="newMailNotification" - label="&accountAdvanced.newMailNotification.label;" hidden="true"/> - -- <groupbox id="protoSpecificGroupbox" class="collapsable" closed="true" -+ <groupbox id="protoSpecificGroupbox" class="collapsable" closed="false" - onkeypress="accountWizard.onGroupboxKeypress(event)"> - <caption id="protoSpecificCaption" - onclick="accountWizard.toggleGroupbox('protoSpecificGroupbox')"/> --- -2.1.4 -

1 0

[tor-messenger-build/master] Merge branch 'master' of git-rw.torproject.org:tor-messenger-build
by sukhbir＠torproject.org 10 May '15

10 May '15

commit 1121b8c027eb00d1dcef8f156fd9c75255de0e5e Merge: 8d9d6c3 067e290 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun May 10 14:39:38 2015 -0400 Merge branch 'master' of git-rw.torproject.org:tor-messenger-build

1 0

[tor-messenger-build/master] Improve the patch for #13855 (known onions for XMPP servers)
by sukhbir＠torproject.org 10 May '15

10 May '15

commit 067e290c39c859e5e430ac73326841754b8ca4cb Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun May 10 14:34:24 2015 -0400 Improve the patch for #13855 (known onions for XMPP servers) - Separate the patches for JS, XUL and locale files - Be more verbose that we are are forcing the user of onion addresses --- projects/instantbird/config | 6 +- projects/instantbird/xmpp-onion-js.patch | 85 ++++++++++++++++++++ projects/instantbird/xmpp-onion-locale.patch | 10 +++ projects/instantbird/xmpp-onion-xul.patch | 31 ++++++++ projects/instantbird/xmpp-onion.patch | 107 -------------------------- 5 files changed, 130 insertions(+), 109 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 38a3deb..af90ba1 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,9 +69,11 @@ input_files: - filename: cert_override.txt - filename: ctcp-time.patch - filename: ctcp-ping.patch - - filename: xmpp-onion.patch - - filename: xmpp-resource.patch - filename: xmpp-domain.patch + - filename: xmpp-resource.patch + - filename: xmpp-onion-js.patch + - filename: xmpp-onion-xul.patch + - filename: xmpp-onion-locale.patch - filename: xmpp-username-split.patch - filename: version.patch - filename: branding/name.patch diff --git a/projects/instantbird/xmpp-onion-js.patch b/projects/instantbird/xmpp-onion-js.patch new file mode 100644 index 0000000..54339ac --- /dev/null +++ b/projects/instantbird/xmpp-onion-js.patch @@ -0,0 +1,85 @@ +diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js +index 707f1c7..2ca929a 100644 +--- a/im/content/accountWizard.js ++++ b/im/content/accountWizard.js +@@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm"); + + const PREF_EXTENSIONS_GETMOREPROTOCOLSURL = "extensions.getMoreProtocolsURL"; + ++// Borrowed and inspired by xmpp-client. ++const kServerOnions = { ++ "riseup.net": "4cjw6cwpeaeppfqz.onion", ++ "jabber.ccc.de": "okj7xc6j2szr2y75.onion", ++ "jabber.otr.im": "5rgdtlawqkcplz75.onion", ++ "jabber.calyxinstitute.org": "ijeeynrc6x2uy5ob.onion", ++} ++ + var accountWizard = { + onload: function aw_onload() { + let topProtoList = document.getElementById("topprotolist"); +@@ -105,6 +113,21 @@ var accountWizard = { + return textbox; + }, + ++ insertOnionAddress: function aw_insertOnionAddress() { ++ // Currently, we only use onion addresses for XMPP. ++ if (this.proto.id == "prpl-jabber") { ++ // If the value of the domain is one for which there exists a ++ // hidden service, replace the address with the onion address. ++ this.jabberDomain = document.getElementById("username-split-0"); ++ if (this.jabberDomain.value in kServerOnions) { ++ this.onionAddress = kServerOnions[this.jabberDomain.value]; ++ } ++ else { ++ this.onionAddress = ""; ++ } ++ } ++ }, ++ + showUsernamePage: function aw_showUsernamePage() { + let proto = this.proto.id; + if ("userNameBoxes" in this && this.userNameProto == proto) { +@@ -160,11 +183,20 @@ var accountWizard = { + document.getElementById("accountusername").next = next; + }, + ++ setOnionAddress: function aw_setOnionAddress() { ++ if (this.proto.id == "prpl-jabber") { ++ document.getElementById("prpl-jabber-server").value = this.onionAddress; ++ } ++ }, ++ + showAdvanced: function aw_showAdvanced() { + // ensure we don't destroy user data if it's not necessary + let id = this.proto.id; +- if ("protoSpecOptId" in this && this.protoSpecOptId == id) ++ if ("protoSpecOptId" in this && this.protoSpecOptId == id) { ++ // But we should still set the onion address, if it exists. ++ this.setOnionAddress(); + return; ++ } + this.protoSpecOptId = id; + + /* FIXME +@@ -172,6 +204,7 @@ var accountWizard = { + !this.proto.newMailNotification; + */ + this.populateProtoSpecificBox(); ++ this.setOnionAddress(); + + let proxyVisible = this.proto.usePurpleProxy; + if (proxyVisible) { +@@ -407,6 +440,13 @@ var accountWizard = { + let label = bundle.getFormattedString("accountColon", [opt.opt.label]); + rows.appendChild(this.createSummaryRow(label, opt.value)); + } ++ ++ if (this.onionAddress) { ++ let onionLabel = document.getElementById("topProtocolsBundle"); ++ let onion = document.getElementById("onionAddress"); ++ onion.value = onionLabel.getFormattedString("onionAddress.label", ++ [this.jabberDomain.value, this.onionAddress]); ++ } + }, + + createAccount: function aw_createAccount() { diff --git a/projects/instantbird/xmpp-onion-locale.patch b/projects/instantbird/xmpp-onion-locale.patch new file mode 100644 index 0000000..a04fe94 --- /dev/null +++ b/projects/instantbird/xmpp-onion-locale.patch @@ -0,0 +1,10 @@ +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties +index 77dd6dd..7ee9bce 100644 +--- a/im/locales/en-US/chrome/instantbird/accountWizard.properties ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties +@@ -19,3 +19,5 @@ topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline + topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger + topProtocol.prpl-msn.description=Microsoft Windows Live Messenger (formerly MSN) + topProtocol.prpl-yahoo.description=Chat with friends using Yahoo! Messenger ++ ++onionAddress.label=We will secure your connection to %S by connecting to %S. diff --git a/projects/instantbird/xmpp-onion-xul.patch b/projects/instantbird/xmpp-onion-xul.patch new file mode 100644 index 0000000..9547d75 --- /dev/null +++ b/projects/instantbird/xmpp-onion-xul.patch @@ -0,0 +1,31 @@ +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +index 5fa5b82..d9ce335 100644 +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -59,7 +59,8 @@ + label="&accountUsernameTitle.label;" + onpageshow="accountWizard.showUsernamePage();" + onpagehide="accountWizard.hideUsernamePage();" +- onpagerewound="return accountWizard.rewindFromUsernamePage();"> ++ onpagerewound="return accountWizard.rewindFromUsernamePage();" ++ onpageadvanced="return accountWizard.insertOnionAddress();"> + <description id="usernameInfo"/> + <separator/> + <vbox id="userNameBox"/> +@@ -98,7 +99,7 @@ + <checkbox id="newMailNotification" + label="&accountAdvanced.newMailNotification.label;" hidden="true"/> + +- <groupbox id="protoSpecificGroupbox" class="collapsable" closed="true" ++ <groupbox id="protoSpecificGroupbox" class="collapsable" closed="false" + onkeypress="accountWizard.onGroupboxKeypress(event)"> + <caption id="protoSpecificCaption" + onclick="accountWizard.toggleGroupbox('protoSpecificGroupbox')"/> +@@ -137,6 +138,7 @@ + </columns> + <rows id="summaryRows"/> + </grid> ++ <description id="onionAddress" /> + <separator/> + <checkbox id="connectAutomatically" label= "&accountSummary.connectAutomatically.label;" checked="true"/> + </wizardpage> diff --git a/projects/instantbird/xmpp-onion.patch b/projects/instantbird/xmpp-onion.patch deleted file mode 100644 index 46a1a76..0000000 --- a/projects/instantbird/xmpp-onion.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 6bd2fc6cbc618e8fcd38411854da2527556e0114 Mon Sep 17 00:00:00 2001 -From: Sukhbir Singh <sukhbir(a)torproject.org> -Date: Fri, 8 May 2015 10:19:31 -0400 -Subject: [PATCH] Use onion addresses for known XMPP servers (#13855) - ---- - im/content/accountWizard.js | 35 ++++++++++++++++++++++++++++++++++- - im/content/accountWizard.xul | 5 +++-- - 2 files changed, 37 insertions(+), 3 deletions(-) - -diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 707f1c7..e763165 100644 ---- a/im/content/accountWizard.js -+++ b/im/content/accountWizard.js -@@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm"); - - const PREF_EXTENSIONS_GETMOREPROTOCOLSURL = "extensions.getMoreProtocolsURL"; - -+// Borrowed and inspired by xmpp-client. -+const kServerOnions = { -+ "riseup.net": "4cjw6cwpeaeppfqz.onion", -+ "jabber.ccc.de": "okj7xc6j2szr2y75.onion", -+ "jabber.otr.im": "5rgdtlawqkcplz75.onion", -+ "jabber.calyxinstitute.org": "ijeeynrc6x2uy5ob.onion", -+} -+ - var accountWizard = { - onload: function aw_onload() { - let topProtoList = document.getElementById("topprotolist"); -@@ -105,6 +113,21 @@ var accountWizard = { - return textbox; - }, - -+ insertOnionAddress: function aw_insertOnionAddress() { -+ // Currently, we only use onion addresses for XMPP. -+ if (this.proto.id == "prpl-jabber") { -+ // If the value of the domain is one for which there exists a -+ // hidden service, replace the address with the onion address. -+ let jabberDomain = document.getElementById("username-split-0"); -+ if (jabberDomain.value in kServerOnions) { -+ this.onionAddress = kServerOnions[jabberDomain.value]; -+ } -+ else { -+ this.onionAddress = ""; -+ } -+ } -+ }, -+ - showUsernamePage: function aw_showUsernamePage() { - let proto = this.proto.id; - if ("userNameBoxes" in this && this.userNameProto == proto) { -@@ -160,11 +183,20 @@ var accountWizard = { - document.getElementById("accountusername").next = next; - }, - -+ setOnionAddress: function aw_setOnionAddress() { -+ if (this.proto.id == "prpl-jabber") { -+ document.getElementById("prpl-jabber-server").value = this.onionAddress; -+ } -+ }, -+ - showAdvanced: function aw_showAdvanced() { - // ensure we don't destroy user data if it's not necessary - let id = this.proto.id; -- if ("protoSpecOptId" in this && this.protoSpecOptId == id) -+ if ("protoSpecOptId" in this && this.protoSpecOptId == id) { -+ // But we should still set the onion address, if it exists. -+ this.setOnionAddress(); - return; -+ } - this.protoSpecOptId = id; - - /* FIXME -@@ -172,6 +204,7 @@ var accountWizard = { - !this.proto.newMailNotification; - */ - this.populateProtoSpecificBox(); -+ this.setOnionAddress(); - - let proxyVisible = this.proto.usePurpleProxy; - if (proxyVisible) { -diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 5fa5b82..89f88fe 100644 ---- a/im/content/accountWizard.xul -+++ b/im/content/accountWizard.xul -@@ -59,7 +59,8 @@ - label="&accountUsernameTitle.label;" - onpageshow="accountWizard.showUsernamePage();" - onpagehide="accountWizard.hideUsernamePage();" -- onpagerewound="return accountWizard.rewindFromUsernamePage();"> -+ onpagerewound="return accountWizard.rewindFromUsernamePage();" -+ onpageadvanced="return accountWizard.insertOnionAddress();"> - <description id="usernameInfo"/> - <separator/> - <vbox id="userNameBox"/> -@@ -98,7 +99,7 @@ - <checkbox id="newMailNotification" - label="&accountAdvanced.newMailNotification.label;" hidden="true"/> - -- <groupbox id="protoSpecificGroupbox" class="collapsable" closed="true" -+ <groupbox id="protoSpecificGroupbox" class="collapsable" closed="false" - onkeypress="accountWizard.onGroupboxKeypress(event)"> - <caption id="protoSpecificCaption" - onclick="accountWizard.toggleGroupbox('protoSpecificGroupbox')"/> --- -2.1.4 -

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 10 May '15

10 May '15

commit 9da99777190562076163638c95c537d9942b7133 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 10 18:15:59 2015 +0000 Update translations for tor_animation --- hu.srt | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/hu.srt b/hu.srt index 78c998d..b384232 100644 --- a/hu.srt +++ b/hu.srt @@ -1,6 +1,6 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +Nagyon használjuk az Internetet. 2 00:00:03,120 --> 00:00:07,700 @@ -13,7 +13,7 @@ food we eat, people we meet, 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +Nagyon használjuk az Internetet. 5 00:00:13,280 --> 00:00:14,640 @@ -40,126 +40,126 @@ and so much more information about you and your life 10 -00:00:29,620 --> 00:00:32,460 +00:00:29,200 --> 00:00:31,500 which you probably didn't mean to share with unknown strangers, 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 +00:00:34,500 --> 00:00:37,000 But not if you're using Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 +00:01:54,200 --> 00:01:55,840 By downloading and using Tor, 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 you can protect the people who need anonymity, 34 -00:02:00,880 --> 00:02:03,640 +00:01:58,880 --> 00:02:01,640 like activists, journalists and bloggers. 35 -00:02:04,000 --> 00:02:09,000 +00:02:02,000 --> 00:02:07,000 Download and use Tor! Or run a relay!

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 10 May '15

10 May '15

commit 42b908b37f5fe482f71dbb6cbbf2ac1dfaff8017 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 10 18:15:08 2015 +0000 Update translations for bridgedb_completed --- hu/LC_MESSAGES/bridgedb.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index 5f352bb..8217c6e 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -11,9 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-03-04 11:11+0000\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-05-10 18:13+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -34,7 +33,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "Elnézést! Valami rosszul működött a kérésed közben." @@ -205,26 +204,27 @@ msgstr "Hogyan kezdjük használni a hidat " #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." -msgstr "A hidak megadásához a Tor Browser -hez, kövese az utasításokat a %s Tor\nBrowser letöltés oldalán %s a Tor Browser indításához." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "A hidak beállításához a Tor böngészőben, először látogasson el a %s Tor böngésző letöltés oldalra %s és kövesse az útmutatást a Tor böngésző letöltéséről és használatáról." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Amikor a 'Tor Hálózati Beállítások' dialógus felugrik, kattintson a 'Konfigurálás'-ra és kövesse\na varászlót amíg az kéri hogy:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Blokkolja vagy cenzúrázza az ön internet szolgáltatója (ISP) a kapcsolatokat\na Tor hálózatához?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -232,29 +232,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Válassza hogy 'Igen' és utána kattintson a 'Következő\"-re. Az ön új hidjai konfigurásához, másolja\nés illessze be a Híd sorokat a felugró ablakba. Végül, kattintson 'Kapcsolódás'-ra, és \nmár készen is van. Ha valamilyen hibát tapasztal, próbáljon a 'Segítség'\n gombra kattintani a 'Tor hálózati beállítások' varázslóban a tobábbi segítségért." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "Megjeleníti ezt az ütenetet." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "Nem csatlakoztatható szállító híd kérelme." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "IPV6 híd kérése." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "Egy csatlakoztatható szállító kérelme TYPE szerint." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Másolat szertése a BridgeDB's publikus GnuPG kulcsából."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 May '15

10 May '15

commit d69feb2ccd5410f22d27a43cd6e5527c53baf997 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 10 18:15:03 2015 +0000 Update translations for bridgedb --- hu/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index ee33232..8217c6e 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-05-10 18:13+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -207,7 +207,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "" +msgstr "A hidak beállításához a Tor böngészőben, először látogasson el a %s Tor böngésző letöltés oldalra %s és kövesse az útmutatást a Tor böngésző letöltéséről és használatáról." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126

1 0

[tor-messenger-build/master] Add locale string for options.domain (usernameSplits)
by sukhbir＠torproject.org 10 May '15

10 May '15

commit 0b55b0fed0d43022fba3db1665304db74eeb13ce Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun May 10 09:29:27 2015 -0400 Add locale string for options.domain (usernameSplits) --- projects/instantbird/config | 1 + projects/instantbird/xmpp-domain.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 0d42169..38a3deb 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -71,6 +71,7 @@ input_files: - filename: ctcp-ping.patch - filename: xmpp-onion.patch - filename: xmpp-resource.patch + - filename: xmpp-domain.patch - filename: xmpp-username-split.patch - filename: version.patch - filename: branding/name.patch diff --git a/projects/instantbird/xmpp-domain.patch b/projects/instantbird/xmpp-domain.patch new file mode 100644 index 0000000..a7d94a4 --- /dev/null +++ b/projects/instantbird/xmpp-domain.patch @@ -0,0 +1,11 @@ +diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties +--- a/chat/locales/en-US/xmpp.properties ++++ b/chat/locales/en-US/xmpp.properties +@@ -79,6 +79,7 @@ + options.connectionSecurity.allowUnencryptedAuth=Allow sending the password unencrypted + options.connectServer=Server + options.connectPort=Port ++options.domain=Domain + + # LOCALIZATION NOTE (*.protocolName) + # This name is used whenever the name of the protocol is shown.

1 0

[tor-messenger-build/master] Add patch for usernameSplits in xmpp.js
by sukhbir＠torproject.org 10 May '15

10 May '15

commit a9ce7a716a40d54e8a6b7d87e8aa21be897d9495 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun May 10 05:11:08 2015 -0400 Add patch for usernameSplits in xmpp.js --- projects/instantbird/config | 1 + projects/instantbird/xmpp-username-split.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index f2da1fa..0d42169 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -71,6 +71,7 @@ input_files: - filename: ctcp-ping.patch - filename: xmpp-onion.patch - filename: xmpp-resource.patch + - filename: xmpp-username-split.patch - filename: version.patch - filename: branding/name.patch - filename: branding/default.png diff --git a/projects/instantbird/xmpp-username-split.patch b/projects/instantbird/xmpp-username-split.patch new file mode 100644 index 0000000..2ecab9d --- /dev/null +++ b/projects/instantbird/xmpp-username-split.patch @@ -0,0 +1,16 @@ +diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js +--- a/chat/protocols/xmpp/xmpp.js ++++ b/chat/protocols/xmpp/xmpp.js +@@ -26,6 +26,12 @@ + get name() "XMPP", + get iconBaseURI() "chrome://prpl-jabber/skin/", + getAccount: function(aImAccount) new XMPPAccount(this, aImAccount), ++ ++ usernameSplits: [ ++ {get label() _("options.domain"), separator: "@", ++ defaultValue: "jabber.org", reverse: true} ++ ], ++ + options: { + resource: {get label() _("options.resource"), + get default() XMPPDefaultResource},

1 0