- tor-commits - lists.torproject.org

[torbirdy/master] Remove redundant patches and associated overlays for #6314 and #6315
by sukhbir＠torproject.org 17 May '16

17 May '16

commit 6b53dfaa246f46ae83abd3e2edf5dd12643c2ec6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 17:43:23 2016 -0400 Remove redundant patches and associated overlays for #6314 and #6315 Patches for the above two bugs have been merged upstream by Arthur Edelstein and our patches and the overlay for the messenger window are redundant. See the above tickets for more information. --- Makefile | 4 +- chrome.manifest | 1 - chrome/content/composeoverlay.js | 85 ------------------------- chrome/content/composeoverlay.xul | 7 -- chrome/skin/contents.rdf | 4 -- patches/date.patch | 70 -------------------- patches/mailnewspref.patch | 26 -------- patches/messageid.patch | 49 -------------- patches/unified.patch | 130 -------------------------------------- 9 files changed, 2 insertions(+), 374 deletions(-) diff --git a/Makefile b/Makefile index 48c661c..7dca2f9 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,11 @@ VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1 FAKETIME := 200001010000 make-xpi: - zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" + zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" make-reproducible: find . -print0 | xargs -0 touch -t $(FAKETIME) - zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" -x *.git* + zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" -x *.git* clean: rm -f ../torbirdy-$(VERSION).xpi diff --git a/chrome.manifest b/chrome.manifest index 33b0a10..d61ecd5 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -1,7 +1,6 @@ content castironthunderbirdclub chrome/content/ overlay chrome://messenger/content/messenger.xul chrome://castironthunderbirdclub/content/overlay.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6} -overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://castironthunderbirdclub/content/composeoverlay.xul overlay chrome://messenger/content/accountcreation/emailWizard.xul chrome://castironthunderbirdclub/content/emailwizard.xul overlay chrome://messenger-newsblog/content/feedAccountWizard.xul chrome://castironthunderbirdclub/content/feedwizard.xul overlay chrome://messenger/content/AccountWizard.xul chrome://castironthunderbirdclub/content/nntpwizard.xul diff --git a/chrome/content/composeoverlay.js b/chrome/content/composeoverlay.js deleted file mode 100644 index 843cfbc..0000000 --- a/chrome/content/composeoverlay.js +++ /dev/null @@ -1,85 +0,0 @@ -var Ci = Components.interfaces; -var Cc = Components.classes; - -function torbirdyTextRandom() { - // Generate alphanumeric random numbers. - var inChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-=_"; - var randomString = ''; - for (var i = 0; i < 10; i++) { - var num = Math.floor(Math.random() * inChars.length); - randomString += inChars.substring(num, num+1); - } - return randomString; -} - -function torbirdyHexString(charCode) { - return ("0" + charCode.toString(16)).slice(-2); -} - -function send_event_handler(event) { - var msgcomposeWindow = document.getElementById("msgcomposeWindow"); - var msg_type = msgcomposeWindow.getAttribute("msgtype"); - - var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - - var is_custom_msg_id = prefs.getBoolPref("mailnews.custom_message_id"); - - if (is_custom_msg_id) { - // Only continue if this is an actual send event. - if (!(msg_type == nsIMsgCompDeliverMode.Now || msg_type == nsIMsgCompDeliverMode.Later)) - return; - - // We now generate the custom message-ID based on the approach described in tagnaq's paper. - var to_field = gMsgCompose.compFields.to; - var cc_field = gMsgCompose.compFields.cc; - var subject_field = gMsgCompose.compFields.subject; - - // When a message is forwarded, remove the references header. - // See https://trac.torproject.org/projects/tor/ticket/6392 - if (gMsgCompose.type === 3 || gMsgCompose.type === 4) { - gMsgCompose.compFields.references = ''; - } - - // Get the text of the body. - try { - var editor = GetCurrentEditor(); - var body = editor.outputToString('text/plain', 4); - } catch(ex) { - // We couldn't get the editor. - var body = ''; - } - - // Generate an 'email' and append a random number. The SHA512 hash of this email will be used later. - var mail = to_field + cc_field + subject_field + body + Math.random(); - - // Generate a SHA512 hash of the string above. - var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"] - .createInstance(Ci.nsIScriptableUnicodeConverter); - var ch = Cc["@mozilla.org/security/hash;1"] - .createInstance(Ci.nsICryptoHash); - converter.charset = "UTF-8"; - - var result = {}; - var data = converter.convertToByteArray(mail, result); - ch.init(ch.SHA512); - ch.update(data, data.length); - - var hash = ch.finish(false); - var pref_hash = [torbirdyHexString(hash.charCodeAt(i)) for (i in hash)].join("").slice(0, 40); - // Randomize characters to upper case and lower case. - var choices = [true, false]; - pref_hash = [choices[Math.floor(Math.random() * choices.length)] ? - e.toUpperCase() : e.toLowerCase() for each (e in pref_hash.split(""))].join(""); - - // Introduce more randomness. - var randomString = torbirdyTextRandom(); - var message_id = pref_hash + randomString; - - // Set the preference to use the custom generated header ID. - // This is the message-ID that will be used in the outgoing message. - prefs.setCharPref("mailnews.header.custom_message_id", message_id); - } -} - -window.addEventListener("compose-send-message", send_event_handler, true); diff --git a/chrome/content/composeoverlay.xul b/chrome/content/composeoverlay.xul deleted file mode 100644 index b9e8aea..0000000 --- a/chrome/content/composeoverlay.xul +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<overlay id="castironthunderbirdclub-compose-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - <script type="application/javascript" src="chrome://castironthunderbirdclub/content/composeoverlay.js" /> - -</overlay> diff --git a/chrome/skin/contents.rdf b/chrome/skin/contents.rdf index 219e790..28d6c2e 100644 --- a/chrome/skin/contents.rdf +++ b/chrome/skin/contents.rdf @@ -19,7 +19,6 @@ <li resource="chrome://global/content/customizeToolbar.xul"/>  <li resource="chrome://messenger/content/messenger.xul"/> - <li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/> </Seq> <Seq about="chrome://global/content/customizeToolbar.xul"> @@ -30,8 +29,5 @@ <Seq about="chrome://messenger/content/messenger.xul"> <li>chrome://castironthunderbirdclub/skin/castironthunderbirdclub.css</li> </Seq> - <Seq about="chrome://messenger/content/messengercompose/messengercompose.xul"> - <li>chrome://castironthunderbirdclub/skin/castironthunderbirdclub.css</li> - </Seq> </RDF> diff --git a/patches/date.patch b/patches/date.patch deleted file mode 100644 index eb3883c..0000000 --- a/patches/date.patch +++ /dev/null @@ -1,70 +0,0 @@ -# HG changeset patch -# Parent ec138f1fcabf10f11ba4a4ba662cba34ab625691 -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Added support for removing the Date header - - -diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp ---- a/mailnews/compose/src/nsMsgCompUtils.cpp -+++ b/mailnews/compose/src/nsMsgCompUtils.cpp -@@ -364,36 +364,42 @@ mime_generate_headers (nsMsgCompFields * - if (deliver_mode == MSG_SaveAsTemplate) { - const char *pStr = fields->GetTemplateName(); - pStr = pStr ? pStr : ""; - ENCODE_AND_PUSH("X-Template: ", false, pStr, charset, usemime); - } - #endif /* SUPPORT_X_TEMPLATE_NAME */ - } - -- PRExplodedTime now; -- PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -- int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; -+ bool local_date_header = true; -+ prefs->GetBoolPref("mailnews.local_date_header_generation", &local_date_header); - -- /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -- then figure out what our local GMT offset is, and append it (since -- PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -- per RFC 1123 (superceding RFC 822.) -- */ -- PR_FormatTimeUSEnglish(buffer_tail, 100, -- "Date: %a, %d %b %Y %H:%M:%S ", -- &now); -+ if (local_date_header) -+ { -+ PRExplodedTime now; -+ PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -+ int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; - -- buffer_tail += PL_strlen (buffer_tail); -- PR_snprintf(buffer_tail, buffer + size - buffer_tail, -- "%c%02d%02d" CRLF, -- (gmtoffset >= 0 ? '+' : '-'), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -- buffer_tail += PL_strlen (buffer_tail); -+ /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -+ then figure out what our local GMT offset is, and append it (since -+ PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -+ per RFC 1123 (superceding RFC 822.) -+ */ -+ PR_FormatTimeUSEnglish(buffer_tail, 100, -+ "Date: %a, %d %b %Y %H:%M:%S ", -+ &now); -+ -+ buffer_tail += PL_strlen (buffer_tail); -+ PR_snprintf(buffer_tail, buffer + size - buffer_tail, -+ "%c%02d%02d" CRLF, -+ (gmtoffset >= 0 ? '+' : '-'), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -+ buffer_tail += PL_strlen (buffer_tail); -+ } - - if (pFrom && *pFrom) - { - ENCODE_AND_PUSH("From: ", true, pFrom, charset, usemime); - } - - if (pReplyTo && *pReplyTo) - { diff --git a/patches/mailnewspref.patch b/patches/mailnewspref.patch deleted file mode 100644 index 6bffc79..0000000 --- a/patches/mailnewspref.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent 721cec51e68558ab41a21d7f3db1b7de0e20f3bd -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Set the default preferences for the patches (https://bugzilla.mozilla.org/show_bug.cgi?id=776397) - - -diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js ---- a/mailnews/mailnews.js -+++ b/mailnews/mailnews.js -@@ -814,8 +814,16 @@ pref("mail.smtp.qos", 0); - pref("mail.nntp.qos", 0); - - // default value for IMAP4 - // in a DSCP environment this should be 56 (0x38, or AF13), ibid. - pref("mail.imap.qos", 0); - - // PgpMime Addon - pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/"); -+ -+// Send emails with the Date header. -+// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409). -+pref("mailnews.local_date_header_generation", true); -+ -+// Allow a custom message-ID to be set through an extension. -+pref("mailnews.custom_message_id", false); -+pref("mailnews.header.custom_message_id", ""); diff --git a/patches/messageid.patch b/patches/messageid.patch deleted file mode 100644 index 1cbebc8..0000000 --- a/patches/messageid.patch +++ /dev/null @@ -1,49 +0,0 @@ -# HG changeset patch -# Parent 433268decbc634fd8855bdc114a9356dfec431dd -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Added support for setting a custom message-ID - - -diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp ---- a/mailnews/compose/src/nsMsgCompUtils.cpp -+++ b/mailnews/compose/src/nsMsgCompUtils.cpp -@@ -1109,19 +1109,36 @@ msg_generate_message_id (nsIMsgIdentity - ++host; - } - - if (!isValidHost(host)) - /* If we couldn't find a valid host name to use, we can't generate a - valid message ID, so bail, and let NNTP and SMTP generate them. */ - return 0; - -- GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -- return PR_smprintf("<%lX.%lX@%s>", -- (unsigned long) now, (unsigned long) salt, host); -+ bool custom_message_id = false; -+ nsCString message_id; -+ -+ nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); -+ if (NS_SUCCEEDED(rv)) { -+ prefs->GetBoolPref("mailnews.custom_message_id", &custom_message_id); -+ prefs->GetCharPref("mailnews.header.custom_message_id", getter_Copies(message_id)); -+ } -+ -+ if (!custom_message_id) -+ { -+ GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -+ return PR_smprintf("<%lX.%lX@%s>", -+ (unsigned long) now, (unsigned long) salt, host); -+ } -+ else -+ { -+ return PR_smprintf("<%s@%s>", -+ message_id.get(), host); -+ } - } - - - inline static bool is7bitCharset(const nsCString& charset) - { - // charset name is canonical (no worry about case-sensitivity) - return charset.EqualsLiteral("HZ-GB-2312") || - Substring(charset, 0, 8).EqualsLiteral("ISO-2022-"); diff --git a/patches/unified.patch b/patches/unified.patch deleted file mode 100644 index 0aa1120..0000000 --- a/patches/unified.patch +++ /dev/null @@ -1,130 +0,0 @@ -# HG changeset patch -# Parent a9d426e01d37d2a72fcfeb8cd63242982d04adb2 -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Prevent local timestamp disclosure via Date and Message-ID header fields. - - -diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp ---- a/mailnews/compose/src/nsMsgCompUtils.cpp -+++ b/mailnews/compose/src/nsMsgCompUtils.cpp -@@ -364,36 +364,42 @@ mime_generate_headers (nsMsgCompFields * - if (deliver_mode == MSG_SaveAsTemplate) { - const char *pStr = fields->GetTemplateName(); - pStr = pStr ? pStr : ""; - ENCODE_AND_PUSH("X-Template: ", false, pStr, charset, usemime); - } - #endif /* SUPPORT_X_TEMPLATE_NAME */ - } - -- PRExplodedTime now; -- PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -- int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; -+ bool local_date_header = true; -+ prefs->GetBoolPref("mailnews.local_date_header_generation", &local_date_header); - -- /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -- then figure out what our local GMT offset is, and append it (since -- PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -- per RFC 1123 (superceding RFC 822.) -- */ -- PR_FormatTimeUSEnglish(buffer_tail, 100, -- "Date: %a, %d %b %Y %H:%M:%S ", -- &now); -+ if (local_date_header) -+ { -+ PRExplodedTime now; -+ PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -+ int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; - -- buffer_tail += PL_strlen (buffer_tail); -- PR_snprintf(buffer_tail, buffer + size - buffer_tail, -- "%c%02d%02d" CRLF, -- (gmtoffset >= 0 ? '+' : '-'), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -- buffer_tail += PL_strlen (buffer_tail); -+ /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -+ then figure out what our local GMT offset is, and append it (since -+ PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -+ per RFC 1123 (superceding RFC 822.) -+ */ -+ PR_FormatTimeUSEnglish(buffer_tail, 100, -+ "Date: %a, %d %b %Y %H:%M:%S ", -+ &now); -+ -+ buffer_tail += PL_strlen (buffer_tail); -+ PR_snprintf(buffer_tail, buffer + size - buffer_tail, -+ "%c%02d%02d" CRLF, -+ (gmtoffset >= 0 ? '+' : '-'), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -+ buffer_tail += PL_strlen (buffer_tail); -+ } - - if (pFrom && *pFrom) - { - ENCODE_AND_PUSH("From: ", true, pFrom, charset, usemime); - } - - if (pReplyTo && *pReplyTo) - { -@@ -1109,19 +1115,36 @@ msg_generate_message_id (nsIMsgIdentity - ++host; - } - - if (!isValidHost(host)) - /* If we couldn't find a valid host name to use, we can't generate a - valid message ID, so bail, and let NNTP and SMTP generate them. */ - return 0; - -- GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -- return PR_smprintf("<%lX.%lX@%s>", -- (unsigned long) now, (unsigned long) salt, host); -+ bool custom_message_id = false; -+ nsCString message_id; -+ -+ nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); -+ if (NS_SUCCEEDED(rv)) { -+ prefs->GetBoolPref("mailnews.custom_message_id", &custom_message_id); -+ prefs->GetCharPref("mailnews.header.custom_message_id", getter_Copies(message_id)); -+ } -+ -+ if (!custom_message_id) -+ { -+ GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -+ return PR_smprintf("<%lX.%lX@%s>", -+ (unsigned long) now, (unsigned long) salt, host); -+ } -+ else -+ { -+ return PR_smprintf("<%s@%s>", -+ message_id.get(), host); -+ } - } - - - inline static bool is7bitCharset(const nsCString& charset) - { - // charset name is canonical (no worry about case-sensitivity) - return charset.EqualsLiteral("HZ-GB-2312") || - Substring(charset, 0, 8).EqualsLiteral("ISO-2022-"); -diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js ---- a/mailnews/mailnews.js -+++ b/mailnews/mailnews.js -@@ -821,8 +821,16 @@ pref("mail.smtp.qos", 0); - pref("mail.nntp.qos", 0); - - // default value for IMAP4 - // in a DSCP environment this should be 56 (0x38, or AF13), ibid. - pref("mail.imap.qos", 0); - - // PgpMime Addon - pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/"); -+ -+// Send emails with the Date header. -+// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409). -+pref("mailnews.local_date_header_generation", true); -+ -+// Allow a custom message-ID to be set through an extension. -+pref("mailnews.custom_message_id", false); -+pref("mailnews.header.custom_message_id", "");

1 0

[snowflake/master] Make koch.jpg square and tile better.
by dcf＠torproject.org 16 May '16

16 May '16

commit 0690b0620d6656090036bc2c1a29542a9ff840aa Author: David Fifield <david(a)bamsoftware.com> Date: Mon May 16 16:43:33 2016 -0700 Make koch.jpg square and tile better. It was wider than tall and there was a column of black pixels at the far right. --- proxy/static/koch.jpg | Bin 95584 -> 131664 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/proxy/static/koch.jpg b/proxy/static/koch.jpg index cf210ef..1a3c1e3 100644 Binary files a/proxy/static/koch.jpg and b/proxy/static/koch.jpg differ

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 16 May '16

16 May '16

commit 3dcaa113b3114dd40de9f0ba4d38259f7edaef38 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 21:45:25 2016 +0000 Update translations for tails-persistence-setup_completed --- pl/pl.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 6e6ac27..1c0a47a 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -5,14 +5,15 @@ # Translators: # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 # bogdrozd <bog.d(a)gazeta.pl>, 2013 +# Jakobus Buntownikus <buntownix(a)gmail.com>, 2016 # sebx, 2013-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-25 17:34+0100\n" -"PO-Revision-Date: 2016-03-21 16:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-04-24 16:40+0200\n" +"PO-Revision-Date: 2016-05-16 21:18+0000\n" +"Last-Translator: Jakobus Buntownikus <buntownix(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -117,10 +118,18 @@ msgid "Lists downloaded by APT" msgstr "Listy pobrane przez APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 +msgid "Mumble server" +msgstr "Serwer Mumble" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +msgid "Mumble server configuration and its Tor Hidden Service address" +msgstr "Konfiguracja serwera Mumble i jego ukrytego serwisu Tor" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Dotfiles" msgstr "Dotfiles" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Zrób dowiązania w $HOME do każdego pliku lub katalogu znajdującego się w katalogu `dotfiles'"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 May '16

16 May '16

commit ef0d0de379c60a58e6ca03a43d04c0861f78e49a Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 21:45:22 2016 +0000 Update translations for tails-persistence-setup --- pl/pl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 2208dcb..1c0a47a 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-04-24 16:40+0200\n" -"PO-Revision-Date: 2016-05-16 21:08+0000\n" +"PO-Revision-Date: 2016-05-16 21:18+0000\n" "Last-Translator: Jakobus Buntownikus <buntownix(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -119,7 +119,7 @@ msgstr "Listy pobrane przez APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Mumble server" -msgstr "" +msgstr "Serwer Mumble" #: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "Mumble server configuration and its Tor Hidden Service address"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 16 May '16

16 May '16

commit 46af4965480ce36922684e3de8e7b819f1f1aae8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 21:15:47 2016 +0000 Update translations for tor-launcher-network-settings_completed --- pl/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd index d613408..18b1a48 100644 --- a/pl/network-settings.dtd +++ b/pl/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> <!ENTITY torsettings.bridgeHelp1 "Jeśli nie jesteś w stanie połączyć się z siecią Tor, może to oznaczać, że Twój Dostawca Usług Internetowych (ISP) lub inna agencja blokuje dostęp do sieci Tor.  Często można obejść ten problem używając Mostów Tor, które są nienotowanymi przekaźnikami, dzięki czemu trudniej je zablokować."> -<!ENTITY torsettings.bridgeHelp1B "Możesz użyć wstępnie skonfigurowany, domyślny zestaw adresów mostów lub możesz uzyskać własny zestaw adresów za pomocą jednej z tych trzech metod:"> +<!ENTITY torsettings.bridgeHelp1B "Możesz użyć prekonfigurowanego, dostarczonego zestawu adresów mostu(bridge adresses) lubmożesz uzyskać niestandardowe zestawy adresów, poprzzez używanie jednej z tych trzech metod:"> <!ENTITY torsettings.bridgeHelp2Heading "Za pośrednictwem sieci Web"> <!ENTITY torsettings.bridgeHelp2 "Użyj przeglądarki internetowej do odwiedzenia https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 16 May '16

16 May '16

commit 526cf84d0e85107abcc436360a6e6613b50ffebf Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 21:15:44 2016 +0000 Update translations for tor-launcher-network-settings --- pl/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd index d956e39..18b1a48 100644 --- a/pl/network-settings.dtd +++ b/pl/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> <!ENTITY torsettings.bridgeHelp1 "Jeśli nie jesteś w stanie połączyć się z siecią Tor, może to oznaczać, że Twój Dostawca Usług Internetowych (ISP) lub inna agencja blokuje dostęp do sieci Tor.  Często można obejść ten problem używając Mostów Tor, które są nienotowanymi przekaźnikami, dzięki czemu trudniej je zablokować."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Możesz użyć prekonfigurowanego, dostarczonego zestawu adresów mostu(bridge adresses) lubmożesz uzyskać niestandardowe zestawy adresów, poprzzez używanie jednej z tych trzech metod:"> <!ENTITY torsettings.bridgeHelp2Heading "Za pośrednictwem sieci Web"> <!ENTITY torsettings.bridgeHelp2 "Użyj przeglądarki internetowej do odwiedzenia https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder">

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 May '16

16 May '16

commit bca6bb3837469b5aaed358820c9849f131cde52c Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 21:15:24 2016 +0000 Update translations for tails-persistence-setup --- pl/pl.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 32719c6..2208dcb 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -5,14 +5,15 @@ # Translators: # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 # bogdrozd <bog.d(a)gazeta.pl>, 2013 +# Jakobus Buntownikus <buntownix(a)gmail.com>, 2016 # sebx, 2013-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-04-24 16:40+0200\n" -"PO-Revision-Date: 2016-04-25 08:33+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-05-16 21:08+0000\n" +"Last-Translator: Jakobus Buntownikus <buntownix(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,7 +123,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "Mumble server configuration and its Tor Hidden Service address" -msgstr "" +msgstr "Konfiguracja serwera Mumble i jego ukrytego serwisu Tor" #: ../lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Dotfiles"

1 0

[torbirdy/master] Global let/const are no longer properties (bugzilla #1209777)
by sukhbir＠torproject.org 16 May '16

16 May '16

commit 31de9e4937791467752bc071104e9363a41735c2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 14:57:29 2016 -0400 Global let/const are no longer properties (bugzilla #1209777) --- chrome/content/composeoverlay.js | 4 ++-- components/torbirdy.js | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/chrome/content/composeoverlay.js b/chrome/content/composeoverlay.js index 25402b3..843cfbc 100644 --- a/chrome/content/composeoverlay.js +++ b/chrome/content/composeoverlay.js @@ -1,5 +1,5 @@ -const Ci = Components.interfaces; -const Cc = Components.classes; +var Ci = Components.interfaces; +var Cc = Components.classes; function torbirdyTextRandom() { // Generate alphanumeric random numbers. diff --git a/components/torbirdy.js b/components/torbirdy.js index 5e8e9ca..ead2508 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -1,18 +1,18 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/AddonManager.jsm"); -const Ci = Components.interfaces; -const Cc = Components.classes; -const Cr = Components.results; +var Ci = Components.interfaces; +var Cc = Components.classes; +var 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"; +var SERVICE_CTRID = "@torproject.org/torbirdy;1"; +var SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); +var SERVICE_NAME = "Main TorBirdy Component"; +var TB_ID = "castironthunderbirdclub(a)torproject.org"; -const kPrefBranch = "extensions.torbirdy.custom."; -const kRestoreBranch = "extensions.torbirdy.restore."; -const kTorBirdyBranch = "extensions.torbirdy."; +var kPrefBranch = "extensions.torbirdy.custom."; +var kRestoreBranch = "extensions.torbirdy.restore."; +var kTorBirdyBranch = "extensions.torbirdy."; // Default preference values for TorBirdy. // These preferences values will be "enforced": even if the user decides to @@ -23,7 +23,7 @@ const kTorBirdyBranch = "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 = { +var TorBirdyPrefs = { "extensions.torbirdy.protected": false, // When the preferences below have been set, enable TorBirdy. @@ -211,7 +211,6 @@ const TorBirdyPrefs = { "browser.cache.memory.enable": false, "browser.cache.offline.enable": false, "browser.formfill.enable": false, - "signon.rememberSignons": false, "signon.autofillForms": false, // https://bugs.torproject.org/10367 @@ -675,4 +674,4 @@ TorBirdy.prototype = { } -const NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]); +var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]);

1 0

[torbirdy/master] Remove compatibility for older versions of Thunderbird
by sukhbir＠torproject.org 16 May '16

16 May '16

commit 15e08342ea9336d9f967b20fc220a1e1c33c6eba Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 13:07:38 2016 -0400 Remove compatibility for older versions of Thunderbird The current version (0.1.4) supports Thunderbird 10.0 - 31.*. We now support Thunderbird 38.* - 45.* and so remove the backward compatibility code. --- chrome/content/preferences.js | 9 ++------- components/torbirdy.js | 31 ++++++++----------------------- install.rdf | 4 ++-- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index a31caf8..f1bf091 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -128,15 +128,10 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { var mailAccounts = []; var accounts = pub.acctMgr.accounts; - // To maintain compatibility between Gecko 17+ and Gecko < 17. - var newGecko = (accounts.queryElementAt) ? true : false; - - var accountLength = newGecko ? accounts.length : accounts.Count(); + var accountLength = accounts.length; for (var i = 0; i < accountLength; i++) { - var account = (newGecko) ? - accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer : - accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer; + var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer; var name = account.prettyName; if (!(name === "Local Folders")) { diff --git a/components/torbirdy.js b/components/torbirdy.js index ba8195e..5e8e9ca 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -107,14 +107,9 @@ const TorBirdyPrefs = { Security */ - // Default is always false for OCSP - it's broken crap - // Why is it broken, you might ask? - // Moxie Marlinspike, a hero to all humans everywhere, defeated it with the - // number '3' at Defcon/Blackhat 2009 His paper: - // http://www.thoughtcrime.org/papers/ocsp-attack.pdf His software to perform - // the attack is here: http://thoughtcrime.org/software/sslsniff/ Furthermore - // - OCSP servers may log information about a user as they use the internet - // generally; it's everything we hate about CRLs and more + // Default is always false for OCSP. + // OCSP servers may log information about a user as they use the internet + // generally; it's everything we hate about CRLs and more. "security.OCSP.enabled": 1, "security.OCSP.GET.enabled": false, "security.OCSP.require": false, @@ -260,11 +255,6 @@ const TorBirdyPrefs = { */ // We hope the user has Enigmail and if so, we believe these improve security. - // We would like these options to be a single shared option we can toggle but - // we require some discussions with upstream and then they would need a new - // release. It's not actually clear how we could or even if we should then - // depend on a specific Enigmail version. Either way, we want to save the - // user who would shoot themselves in the privacy-foot. // Disable X-Enigmail headers. // We don't want to obviously disclose that we're using Enigmail as it may @@ -365,6 +355,7 @@ const TorBirdyPrefs = { /* Finish */ + // All preferences have been set: now enable TorBirdy. "extensions.torbirdy.protected": true, } @@ -591,13 +582,10 @@ TorBirdy.prototype = { var allAccounts = []; // To maintain compatibility between Gecko 17+ and Gecko < 17, find out // which version we are on. - var newGecko = (accounts.queryElementAt) ? true : false; - var accountLength = newGecko ? accounts.length : accounts.Count(); + var accountLength = accounts.length; for (var i = 0; i < accountLength; i++) { - var account = (newGecko) ? - accounts.queryElementAt(i, Ci.nsIMsgAccount) : - accounts.QueryElementAt(i, Ci.nsIMsgAccount); + var account = accounts.queryElementAt(i, Ci.nsIMsgAccount); allAccounts.push(account); } @@ -609,13 +597,10 @@ TorBirdy.prototype = { // Get the locations of the Draft folder for all identities and save them. // We only need to do this for IMAP accounts. if (account.type === "imap") { - // Again ensure we maintain compatibility between different Gecko versions. - var identLength = newGecko ? identities.length : identities.Count(); + var identLength = identities.length; for (var ident = 0; ident < identLength; ident++) { - var identity = (newGecko) ? - identities.queryElementAt(ident, Ci.nsIMsgIdentity) : - identities.QueryElementAt(ident, Ci.nsIMsgIdentity); + var identity = identities.queryElementAt(ident, Ci.nsIMsgIdentity); var key = identity.key; // We need to restore the following preferences after we are uninstalled/disabled. diff --git a/install.rdf b/install.rdf index 3bad250..34c634c 100644 --- a/install.rdf +++ b/install.rdf @@ -12,8 +12,8 @@  <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> - <em:minVersion>10.0</em:minVersion> - <em:maxVersion>31.*</em:maxVersion> + <em:minVersion>38.*</em:minVersion> + <em:maxVersion>45.*</em:maxVersion> </Description> </em:targetApplication>

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 16 May '16

16 May '16

commit 48213a3ad1d6bcc243d9f13a1f5f412064b8f754 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 16 17:16:35 2016 +0000 Update translations for tor-messenger-otrproperties --- ja/otr.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ja/otr.properties b/ja/otr.properties index 44f026c..8e6fb7f 100644 --- a/ja/otr.properties +++ b/ja/otr.properties @@ -15,17 +15,17 @@ msgevent.rcvdmsg_unecrypted=%S からの以下のメッセージは暗号化さ msgevent.rcvdmsg_unrecognized=%S からの認識できない非公開メッセージを受信しました。 msgevent.rcvdmsg_for_other_instance=%S は別のセッションへのメッセージを送信しました。もし他のデバイスなどでログインしている場合、そちらでメッセージを受け取っているかもしれません。 context.gone_secure_private=%S とのプライベートな会話を開始しました。 -context.gone_secure_unverified=%S とのプライベートな会話を開始しました。しかし、本人確認が取れていません。 +context.gone_secure_unverified=%S とのプライベートな会話を開始しました。しかし、本人であるか検証できません。 context.still_secure=%S とのプライベートな会話のリフレッシュに成功しました。 error.enc=メッセージの暗号化中にエラーが発生しました。 -error.not_priv=You sent encrypted data to %S, who wasn't expecting it. -error.unreadable=You transmitted an unreadable encrypted message. -error.malformed=You transmitted a malformed data message. +error.not_priv=%S に暗号化データを送信しましたが、相手は受信できません。 +error.unreadable=相手が読み取れない暗号化メッセージを送信しました。 +error.malformed=不正なデータメッセージを送信しました。 resent=[再送信] -tlv.disconnected=%S has ended their private conversation with you; you should do the same. -query.msg=%S has requested an Off-the Record private conversation. However, you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for more information. +tlv.disconnected=%S はプライベートな会話を終了しました。こちらも終了する必要があります。 +query.msg=%S は非公開のプライベートな会話を要求しています。しかし、これをサポートするプラグインがインストールされていません。http://otr.cypherpunks.ca/ で詳細情報を確認してください。 trust.unused=未使用 -trust.not_private=Not Private -trust.unverified=Unverified -trust.private=Private -trust.finished=Finished +trust.not_private=非プライベート +trust.unverified=未検証 +trust.private=プライベート +trust.finished=完了

1 0