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

[tor-messenger-build/master] Add a patch for trac 16476
by arlo＠torproject.org 07 Nov '15

07 Nov '15

commit 329d846869dcb07ae534ba0c0f2a5d872e140ccf Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Nov 6 18:11:29 2015 -0800 Add a patch for trac 16476 * Themes preference is positioned incorrectly on OS X --- ChangeLog | 3 +++ projects/instantbird/config | 2 ++ projects/instantbird/trac-16476.patch | 38 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1ec0ae1..9c3e2f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ Tor Messenger 0.1.0b4 -- * Bug 17492: Include default bridges configuration * Use tor and the pluggable transports from tor-browser 5.0.4 * Bug 17552: Instantbird throwing on XMPP non-MUC message stanzas w/ subject + * Mac + * Bug 16476: Themes preference is positioned incorrectly + * Bug 17456: Hang in preferences menu Tor Messenger 0.1.0b3 -- October 30 2015 * Windows diff --git a/projects/instantbird/config b/projects/instantbird/config index f9bfdb7..d2ffb5d 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -104,6 +104,8 @@ input_files: enable: '[% c("var/osx") %]' - filename: cert_override.txt enable: '[% c("var/osx") %]' + - filename: trac-16476.patch + enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch diff --git a/projects/instantbird/trac-16476.patch b/projects/instantbird/trac-16476.patch new file mode 100644 index 0000000..96eabb4 --- /dev/null +++ b/projects/instantbird/trac-16476.patch @@ -0,0 +1,38 @@ +# HG changeset patch +# User aleth <aleth(a)instantbird.org> +# Date 1446853955 -3600 +# Sat Nov 07 00:52:35 2015 +0100 +# Node ID 1f09dc616d2e058779753327637b85f6dcc0bbf1 +# Parent 073468887b0faecb810a6e4463a2806924fead81 +Bug 1222238 - Avoid hang in proxy preferences pane. r=clokep + +diff --git a/im/content/preferences/messagestyle.js b/im/content/preferences/messagestyle.js +--- a/im/content/preferences/messagestyle.js ++++ b/im/content/preferences/messagestyle.js +@@ -169,22 +169,20 @@ var previewObserver = { + + observe: function(aSubject, aTopic, aData) { + if (aTopic != "conversation-loaded" || aSubject != this.browser) + return; + + // We want to avoid the convbrowser trying to scroll to the last + // added message, as that causes the entire pref pane to jump up + // (bug 1179943). Therefore, we override the method convbrowser +- // uses to determine if there are further messages pending to be +- // added. The +1 ensures no scroll occurs after we add the last +- // message here. +- this.browser._autoScrollEnabled = false; +- this.browser.getPendingMessagesCount = +- () => previewObserver.conv.messages.length + 1; ++ // uses to determine if it should scroll, as well as its ++ // mirror in the contentWindow (that messagestyle JS can call). ++ this.browser.autoScrollEnabled = () => false; ++ this.browser.contentWindow.autoScrollEnabled = () => false; + + // Display all queued messages. Use a timeout so that message text + // modifiers can be added with observers for this notification. + setTimeout(function() { + for (let message of previewObserver.conv.messages) + aSubject.appendMessage(message, false); + }, 0); +

1 0

[tor-messenger-build/master] Add patch for trac 17552
by arlo＠torproject.org 07 Nov '15

07 Nov '15

commit efe3391fe4a4ffa136d6fa3e9c229b16a0a04dee Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Nov 6 18:02:56 2015 -0800 Add patch for trac 17552 * Instantbird throwing on XMPP non-MUC message stanzas w/ subject --- ChangeLog | 1 + projects/instantbird/config | 1 + projects/instantbird/trac-17552.patch | 92 +++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/ChangeLog b/ChangeLog index 66430f2..1ec0ae1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Tor Messenger 0.1.0b4 -- * Bug 17539: Pass username when interpolating resent string * Bug 17492: Include default bridges configuration * Use tor and the pluggable transports from tor-browser 5.0.4 + * Bug 17552: Instantbird throwing on XMPP non-MUC message stanzas w/ subject Tor Messenger 0.1.0b3 -- October 30 2015 * Windows diff --git a/projects/instantbird/config b/projects/instantbird/config index 4993c8c..f9bfdb7 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -71,6 +71,7 @@ input_files: - filename: xmppRegister.js - filename: xmppRegister.xul - filename: xmpp-gtalk-resource.patch + - filename: trac-17552.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch diff --git a/projects/instantbird/trac-17552.patch b/projects/instantbird/trac-17552.patch new file mode 100644 index 0000000..f4ff411 --- /dev/null +++ b/projects/instantbird/trac-17552.patch @@ -0,0 +1,92 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1446859847 28800 +# Fri Nov 06 17:30:47 2015 -0800 +# Node ID b9b0e61d9a2d5092d45b309feb4ae526ae00519c +# Parent 073468887b0faecb810a6e4463a2806924fead81 +Ensure isMuc when attempting a subject change + +diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm +--- a/chat/protocols/xmpp/xmpp.jsm ++++ b/chat/protocols/xmpp/xmpp.jsm +@@ -1718,16 +1718,17 @@ var XMPPAccountPrototype = { + + return null; + }, + + /* Called when a message stanza is received */ + onMessageStanza: function(aStanza) { + let from = aStanza.attributes["from"]; + let norm = this.normalize(from); ++ let isMuc = this._mucs.has(norm); + + let type = aStanza.attributes["type"]; + let x = aStanza.getElement(["x"]); + let body; + let b = aStanza.getElement(["body"]); + if (b) { + // If there's a <body> child we have more than just typing notifications. + // Prefer HTML (in <html><body>) and use plain text (<body>) as fallback. +@@ -1738,17 +1739,21 @@ var XMPPAccountPrototype = { + // Even if the message is in plain text, the prplIMessage + // should contain a string that's correctly escaped for + // insertion in an HTML document. + body = TXTToHTML(b.innerText); + } + } + + let subject = aStanza.getElement(["subject"]); +- if (subject) { ++ // Ignore subject when !isMuc. We're being permissive about subject changes ++ // in the comment below, so we need to be careful about where that makes ++ // sense. Psi+'s OTR plugin includes a subject and body in its message ++ // stanzas. ++ if (subject && isMuc) { + // XEP-0045 (7.2.16): Check for a subject element in the stanza and update + // the topic if it exists. + // We are breaking the spec because only a message that contains a + // <subject/> but no <body/> element shall be considered a subject change + // for MUC, but we ignore that to be compatible with ejabberd versions + // before 15.06. + let muc = this._mucs.get(norm); + let nick = this._parseJID(from).resource; +@@ -1763,18 +1768,18 @@ var XMPPAccountPrototype = { + let delay = aStanza.getElement(["delay"]); + if (delay && delay.uri == Stanza.NS.delay) { + if (delay.attributes["stamp"]) + date = new Date(delay.attributes["stamp"]); + } + if (date && isNaN(date)) + date = undefined; + if (type == "groupchat" || +- (type == "error" && this._mucs.has(norm) && !this._conv.has(from))) { +- if (!this._mucs.has(norm)) { ++ (type == "error" && isMuc && !this._conv.has(from))) { ++ if (!isMuc) { + this.WARN("Received a groupchat message for unknown MUC " + norm); + return; + } + let muc = this._mucs.get(norm); + muc.incomingMessage(body, aStanza, date); + return; + } + +@@ -1840,17 +1845,17 @@ var XMPPAccountPrototype = { + if (state) { + this.DEBUG(state); + if (state == "composing") + typingState = Ci.prplIConvIM.TYPING; + else if (state == "paused") + typingState = Ci.prplIConvIM.TYPED; + } + let convName = norm; +- if (this._mucs.has(norm)) ++ if (isMuc) + convName = from; + let conv = this._conv.get(convName); + if (!conv) + return; + conv.updateTyping(typingState, conv.shortName); + conv.supportChatStateNotifications = !!state; + }, +

1 0

[tor-messenger-build/master] Bug 17492: Include default bridges configuration
by boklm＠torproject.org 07 Nov '15

07 Nov '15

commit 7a1c6fd121dd001eb999ef03ebbbed264da37026 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 7 00:45:48 2015 +0100 Bug 17492: Include default bridges configuration However, we exclude meek from the bridges configuration, as it currently doesn't work in Tor Messenger because it requires firefox. --- ChangeLog | 1 + projects/bundle-data/build | 4 ++-- projects/bundle-data/config | 11 +---------- projects/tor-messenger/build | 12 +++++++++++- projects/tor-messenger/build.osx | 8 +++++++- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdee35c..2f8fbd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Tor Messenger 0.1.0b4 -- * Bug 16478: Update certificate pane in preferences window * ctypes-otr * Bug 17539: Pass username when interpolating resent string + * Bug 17492: Include default bridges configuration Tor Messenger 0.1.0b3 -- October 30 2015 * Windows diff --git a/projects/bundle-data/build b/projects/bundle-data/build index 3528675..64d1426 100644 --- a/projects/bundle-data/build +++ b/projects/bundle-data/build @@ -1,5 +1,5 @@ #!/bin/sh set -e tar xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] -cd [% project %]-[% c('version') %]/[% c("var/bundledir") %] -tar czf [% dest_dir _ '/' _ c('filename') %] . +cd [% project %]-[% c('version') %] +tar czf [% dest_dir _ '/' _ c('filename') %] Bundle-Data diff --git a/projects/bundle-data/config b/projects/bundle-data/config index 1fdc028..4e1d7d6 100644 --- a/projects/bundle-data/config +++ b/projects/bundle-data/config @@ -2,13 +2,4 @@ version: '[% c("abbrev") %]' git_url: https://git.torproject.org/builders/tor-browser-bundle.git git_hash: faa6152ada46c03bac9918dd69fa5646847be2e1 -filename: 'bundle-data-[% c("version") %]-[% c("var/osname") %].tar.gz' -var: - bundledir: Bundle-Data/linux -targets: - windows-i686: - var: - bundledir: Bundle-Data/windows - osx-x86_64: - var: - bundledir: Bundle-Data/mac/TorBrowser +filename: 'bundle-data-[% c("version") %].tar.gz' diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 40641e0..7dba35b 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -6,6 +6,8 @@ set -e STOP; END -%] +rootdir=$(pwd) + mkdir bundle [% IF c("var/windows") -%] 7z x -y -obundle [% c('input_files_by_name/instantbird') %] @@ -23,7 +25,12 @@ rm -f bundle/Messenger/*.chk [% END -%] mkdir bundle/Messenger/TorMessenger -tar xf [% c('input_files_by_name/bundle-data') %] -C bundle/Messenger/TorMessenger +tar xf [% c('input_files_by_name/bundle-data') %] +[% IF c("var/linux") -%] +mv Bundle-Data/linux/* bundle/Messenger/TorMessenger/ +[% ELSE -%] +mv Bundle-Data/windows/* bundle/Messenger/TorMessenger/ +[% END -%] [% IF c("var/linux") %] tar xf [% c('input_files_by_name/gcc') %] @@ -45,6 +52,9 @@ tar xf ../../../[% c('input_files_by_name/ctypes-otr') %] mv ctypes-otr* 'ctypes-otr@tormessenger' mkdir tor-launcher(a)torproject.org 7z x -y -otor-launcher(a)torproject.org ../../../[% c('input_files_by_name/tor-launcher') %] +# exclude meek as it requires firefox +fgrep -v extensions.torlauncher.default_bridge.meek- $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ + tor-launcher(a)torproject.org/defaults/preferences/prefs.js mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data [% IF c("var/windows") -%] 7z x ../../../[% c('input_files_by_name/tor-browser') %] diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 16e9b47..1c79518 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -7,10 +7,16 @@ mv TorMessenger.app Tor\ Messenger.app tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH" +# extract bundle data files to Bundle-Data +tar xf [% c('input_files_by_name/bundle-data') %] + mkdir torbrowser cd torbrowser mkdir tor-launcher(a)torproject.org 7z x -y -otor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] +# exclude meek as it requires firefox +fgrep -v extensions.torlauncher.default_bridge.meek- $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ + tor-launcher(a)torproject.org/defaults/preferences/prefs.js 7z x $rootdir/[% c('input_files_by_name/tor-browser') %] bsdtar xf '0.unknown partition' sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults @@ -28,7 +34,7 @@ mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes- cd .. mkdir Tor\ Messenger.app/TorMessenger -tar xf [% c('input_files_by_name/bundle-data') %] -C Tor\ Messenger.app/TorMessenger +mv Bundle-Data/mac/TorBrowser/* Tor\ Messenger.app/TorMessenger/ mkdir dmg mv Tor\ Messenger.app dmg

1 0

[tor-messenger-build/master] bundle-data: update for default bridges updates
by boklm＠torproject.org 07 Nov '15

07 Nov '15

commit 2f29f9996b1d59c196731d2cd37e4d790f1d10ad Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 7 01:06:28 2015 +0100 bundle-data: update for default bridges updates --- projects/bundle-data/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/bundle-data/config b/projects/bundle-data/config index 4e1d7d6..83cfc9f 100644 --- a/projects/bundle-data/config +++ b/projects/bundle-data/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/builders/tor-browser-bundle.git -git_hash: faa6152ada46c03bac9918dd69fa5646847be2e1 +git_hash: 310740285eed2a0e5fc2fd05c29eaa5ebeec27b9 filename: 'bundle-data-[% c("version") %].tar.gz'

1 0

[tor-messenger-build/master] Fix path to pluggable transports in torrc-defaults on Linux and Windows
by boklm＠torproject.org 07 Nov '15

07 Nov '15

commit 5fe7b8d65507ef9d398abdbb24d478b3a92bf5a6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 7 01:02:14 2015 +0100 Fix path to pluggable transports in torrc-defaults on Linux and Windows --- projects/tor-messenger/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 7dba35b..19de0af 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -65,6 +65,10 @@ tar xf ../../../[% c('input_files_by_name/tor-browser') %] [% END -%] sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +sed -i 's|TorBrowser/Tor/PluggableTransports|extensions/tor-launcher(a)torproject.org/TorBrowser/Tor/PluggableTransports|g' \ + tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +sed -i 's|TorBrowser\\Tor\\PluggableTransports|extensions\\tor-launcher(a)torproject.org\\TorBrowser\\Tor\\PluggableTransports|g' \ + tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor mv tor-browser_en-US/Browser/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor rm -Rf tor-browser_en-US

1 0

[tor-messenger-build/master] tor-browser: update to 5.0.4
by boklm＠torproject.org 07 Nov '15

07 Nov '15

commit a54f176996083bdb704fc1d3bf36f8645e555065 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 7 01:11:30 2015 +0100 tor-browser: update to 5.0.4 --- ChangeLog | 1 + projects/tor-browser/config | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2f8fbd9..66430f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Tor Messenger 0.1.0b4 -- * ctypes-otr * Bug 17539: Pass username when interpolating resent string * Bug 17492: Include default bridges configuration + * Use tor and the pluggable transports from tor-browser 5.0.4 Tor Messenger 0.1.0b3 -- October 30 2015 * Windows diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d0daeb8..3a65750 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.0.3 +version: 5.0.4 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 06 Nov '15

06 Nov '15

commit 194531e592893507a8f371e32c0ebc6ed3fcca1d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 22:45:48 2015 +0000 Update translations for tor-launcher-network-settings_completed --- it/network-settings.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 026e63e..6888c98 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -1,5 +1,9 @@ <!ENTITY torsettings.dialog.title "Impostazioni rete Tor"> + +<!ENTITY torlauncher.localePicker.title "Lingua per il Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Selezionare una lingua."> +  <!ENTITY torsettings.prompt "Prima di connetterti alla rete Tor, devi fornire le informazioni riguardo la connessione internet di questo computer.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 06 Nov '15

06 Nov '15

commit c92cca967e264a910abc9f49202bb8cdc78322f1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 22:45:44 2015 +0000 Update translations for tor-launcher-network-settings --- it/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 2f9859e..6888c98 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Impostazioni rete Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Lingua per il Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Selezionare una lingua.">

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 06 Nov '15

06 Nov '15

commit 9860b8c8a7aa96e12feaae00f1a5de27a6feb21f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 22:45:23 2015 +0000 Update translations for liveusb-creator_completed --- it/it.po | 139 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 75 insertions(+), 64 deletions(-) diff --git a/it/it.po b/it/it.po index ab99b12..6cf8632 100644 --- a/it/it.po +++ b/it/it.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alessandro Manfredi <a.n0on3(a)gmail.com>, 2015 # Daniele Catanesi <translate(a)ccielogs.com>, 2009 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 @@ -23,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-26 18:08+0100\n" -"PO-Revision-Date: 2015-10-30 18:03+0000\n" -"Last-Translator: Random_R\n" +"POT-Creation-Date: 2015-11-02 21:23+0100\n" +"PO-Revision-Date: 2015-11-06 22:31+0000\n" +"Last-Translator: Alessandro Manfredi <a.n0on3(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +42,7 @@ msgstr "\"Clona e installa\"" msgid "\"Install from ISO\"" msgstr "Installa da ISO" -#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 #, python-format msgid "%(distribution)s Installer" msgstr "Installatore di %(distribution)s" @@ -66,51 +67,61 @@ msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" msgid "%s already bootable" msgstr "%s è già avviabile" -#: ../liveusb/launcher_ui.py:156 -msgid "" -"<!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\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -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:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Bisogno di aiuto? Leggi la </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentazione</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" - -#: ../liveusb/launcher_ui.py:151 -msgid "" -"<!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\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -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:11pt; 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:11pt;\">Copiare l'attuale Tails nella chiavetta USB o nella scheda SD. Tutti i dati nel dispositivo di destinazione andranno persi.</span></p></body></html>" - -#: ../liveusb/launcher_ui.py:153 +#: ../liveusb/launcher_ui.py:160 msgid "" "<!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\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -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:11pt; 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:11pt;\">Copiare l'attuale istanza di Tails in un dispositivo dove Tails è già installato. Le altre partizioni esistenti saranno preservate.</span></p></body></html>" +"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" +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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Hai bisogno di aiuto? Leggi la <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentazione</span></a>.</p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" -"<!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\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; 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:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -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:11pt; 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:11pt;\">Aggiornate un'installazione di Tails esistente da un immagine ISO più recente.</span></p></body></html>" +"<ul>\n" +"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n" +"\n" +"<li>The USB stick that you install on is formatted and all data is lost.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Installa Tails su un'altra chiave USB copiando il sistema Tails che stai utilizzando al momento.</li>\n\n<li>La chiave USB sulla quale effettuerai l'installazione verrà formattata e tutti i dati su essa presenti verranno persi.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che stai usando al momento non verrà copiato.</li>\n\n</ul>" + +#: ../liveusb/launcher_ui.py:157 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Aggiorna un'altra chiave USB Tails alla stessa versione di Tails che stai usando al momento.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che aggiornerai verrà preservato.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che stai usando al momento non verrà copiato.</li>\n\n</ul>" + +#: ../liveusb/launcher_ui.py:159 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Aggiorna un'altra chiave USB Tails alla versione di un'immagine ISO</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che aggiornerai verrà preservato.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che stai usando al momento non verrà copiato.</li>\n\n</ul>" -#: ../liveusb/dialog.py:154 +#: ../liveusb/dialog.py:161 msgid "Alt+B" msgstr "Alt+B" -#: ../liveusb/dialog.py:153 +#: ../liveusb/dialog.py:160 msgid "Browse" msgstr "Sfoglia" -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:167 msgid "" "By allocating extra space on your USB stick for a persistent overlay, you " "will be able to store data and make permanent modifications to your live " @@ -132,20 +143,6 @@ msgstr "Impossibile trovare" msgid "Cannot find device %s" msgstr "Impossibile trovare il dispositivo %s" -#: ../liveusb/launcher_ui.py:150 -msgid "" -"Clone\n" -"&&\n" -"Install" -msgstr "Clonare\n&&\nInstallare" - -#: ../liveusb/launcher_ui.py:152 -msgid "" -"Clone\n" -"&&\n" -"Upgrade" -msgstr "Clonare\n&&\nAggiornare" - #: ../liveusb/creator.py:417 #, python-format msgid "Creating %sMB persistent overlay" @@ -156,7 +153,7 @@ msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Il dispositivo non è stato ancora montato, quindi non è possibile determinare lo spazio disponibile." -#: ../liveusb/dialog.py:157 +#: ../liveusb/dialog.py:164 #, python-format msgid "Download %(distribution)s" msgstr "Scaricare %(distribution)s" @@ -216,13 +213,19 @@ msgstr "Verifica ISO MD5 completata correttamente" msgid "ISO MD5 checksum verification failed" msgstr "Verifica ISO MD5 fallita" -#: ../liveusb/dialog.py:156 +#: ../liveusb/dialog.py:163 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "Se non si ha selezionato un Live ISO esistente, verrà scaricata la release selezionata." -#: ../liveusb/dialog.py:165 +#: ../liveusb/launcher_ui.py:154 +msgid "" +"Install\n" +"by cloning" +msgstr "Installa attraverso clonazione" + +#: ../liveusb/dialog.py:172 msgid "Install Tails" msgstr "Installare Tails" @@ -304,7 +307,7 @@ msgstr "Partizionamento dispositivo %(device)s" msgid "Persistent Storage" msgstr "Persistenza Dati" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:168 msgid "Persistent Storage (0 MB)" msgstr "Archiviazione Permanente (0 MB)" @@ -358,7 +361,7 @@ msgstr "La verifica MD5 sul file ISO selezionato non è supportata. L'operazione msgid "Synchronizing data on disk..." msgstr "Sincronizzazione dati sul disco..." -#: ../liveusb/dialog.py:159 +#: ../liveusb/dialog.py:166 msgid "Target Device" msgstr "Dispositivo di destinazione" @@ -382,14 +385,14 @@ msgid "" "A more detailed error log has been written to '%(filename)s'." msgstr "Si è verificato un problema durante l'esecuzione del comando: `%(command)s`.\nPer visualizzare ulteriori dettagli aprire il file '%(filename)s'." -#: ../liveusb/dialog.py:151 +#: ../liveusb/dialog.py:158 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." msgstr "Questo pulsante consente la ricerca di un sistema Live ISO esistente, precedentemente scaricato. Se non se ne eleziona uno, una release verrà scaricata automaticamente." -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:171 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -397,19 +400,19 @@ msgid "" "installing the bootloader." msgstr "Questo pulsante avvierà il processo di creazione LiveUSB. Ciò implica lo scaricamento opzionale di una release (se non ne è stata selezionata una esistente), l'estrazione dell'ISO nel dispositivo USB, la creazione dell'overlay permanente e l'installazione del bootloader." -#: ../liveusb/dialog.py:158 +#: ../liveusb/dialog.py:165 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 "Questa è la chiavetta USB nella quale si vuole installare il sistema Live. Questo dispositivo deve essere formattato con il filesystem FAT." -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:170 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "Questa è la barra di progresso che indicherà a che punto si è con il processo di creazione della LiveUSB" -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:169 msgid "This is the status console, where all messages get written to." msgstr "Questa è la console di stato, dove vengono scritti tutti i messaggi." @@ -538,11 +541,19 @@ msgstr "Filesystem non supportato: %s\nEseguire un backup e formattare il pendri msgid "Updating properties of system partition %(system_partition)s" msgstr "Aggiornamento proprietà della partizione di sistema %(system_partition)s" -#: ../liveusb/launcher_ui.py:154 -msgid "Upgrade from ISO" -msgstr "Aggiornare da ISO" +#: ../liveusb/launcher_ui.py:156 +msgid "" +"Upgrade\n" +"by cloning" +msgstr "Aggiorna attraverso clonazione" + +#: ../liveusb/launcher_ui.py:158 +msgid "" +"Upgrade\n" +"from ISO" +msgstr "Aggiorna da immagine ISO" -#: ../liveusb/dialog.py:152 +#: ../liveusb/dialog.py:159 msgid "Use existing Live system ISO" msgstr "Usare sistema Live ISO esistente" @@ -608,6 +619,6 @@ msgstr "È possibile tentare di ripristinare il download" msgid "You must run this application as root" msgstr "Per eseguire questa applicazione sono necessari i privilegi di root" -#: ../liveusb/dialog.py:155 +#: ../liveusb/dialog.py:162 msgid "or" msgstr "o"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 06 Nov '15

06 Nov '15

commit e30f6508f7bfba777fa239a89a66c9158a3da733 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 6 22:45:18 2015 +0000 Update translations for liveusb-creator --- it/it.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/it/it.po b/it/it.po index ee270af..6cf8632 100644 --- a/it/it.po +++ b/it/it.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alessandro Manfredi <a.n0on3(a)gmail.com>, 2015 # Daniele Catanesi <translate(a)ccielogs.com>, 2009 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 @@ -24,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2015-11-03 09:24+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-11-06 22:31+0000\n" +"Last-Translator: Alessandro Manfredi <a.n0on3(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,7 +74,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</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:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Hai bisogno di aiuto? Leggi la <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentazione</span></a>.</p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" @@ -85,7 +86,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Installa Tails su un'altra chiave USB copiando il sistema Tails che stai utilizzando al momento.</li>\n\n<li>La chiave USB sulla quale effettuerai l'installazione verrà formattata e tutti i dati su essa presenti verranno persi.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che stai usando al momento non verrà copiato.</li>\n\n</ul>" #: ../liveusb/launcher_ui.py:157 msgid "" @@ -98,7 +99,7 @@ msgid "" "\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Aggiorna un'altra chiave USB Tails alla stessa versione di Tails che stai usando al momento.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che aggiornerai verrà preservato.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che stai usando al momento non verrà copiato.</li>\n\n</ul>" #: ../liveusb/launcher_ui.py:159 msgid "" @@ -110,7 +111,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Aggiorna un'altra chiave USB Tails alla versione di un'immagine ISO</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che aggiornerai verrà preservato.</li>\n\n<li>Il disco cifrato persistente sulla chiave USB Tails che stai usando al momento non verrà copiato.</li>\n\n</ul>" #: ../liveusb/dialog.py:161 msgid "Alt+B" @@ -222,7 +223,7 @@ msgstr "Se non si ha selezionato un Live ISO esistente, verrà scaricata la rele msgid "" "Install\n" "by cloning" -msgstr "" +msgstr "Installa attraverso clonazione" #: ../liveusb/dialog.py:172 msgid "Install Tails" @@ -544,13 +545,13 @@ msgstr "Aggiornamento proprietà della partizione di sistema %(system_partition) msgid "" "Upgrade\n" "by cloning" -msgstr "" +msgstr "Aggiorna attraverso clonazione" #: ../liveusb/launcher_ui.py:158 msgid "" "Upgrade\n" "from ISO" -msgstr "" +msgstr "Aggiorna da immagine ISO" #: ../liveusb/dialog.py:159 msgid "Use existing Live system ISO"

1 0