- tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 2771d00ec52fca20602ab785d96b365ce6c3904a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:15:34 2016 +0000 Update translations for liveusb-creator --- nn/nn.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index d64ecdc..4da00d9 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 msgid "" 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: 2016-02-10 16:08+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,11 +20,11 @@ msgstr "" #: ../liveusb/gui.py:451 msgid "\"Clone & Install\"" -msgstr "" +msgstr "«Klon og installer" #: ../liveusb/gui.py:453 msgid "\"Install from ISO\"" -msgstr "" +msgstr "«Installerer frå ISO" #: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 #, python-format @@ -140,7 +140,7 @@ msgstr "" #: ../liveusb/dialog.py:164 #, python-format msgid "Download %(distribution)s" -msgstr "" +msgstr "Last ned %(distribution)s" #: ../liveusb/gui.py:778 msgid "Download complete!"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit d00b6b929ddf4cc4a9e678ee32f635ca760b756c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:15:27 2016 +0000 Update translations for https_everywhere --- nn/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index 82144c5..c3eaa8e 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -3,7 +3,7 @@ <!ENTITY https-everywhere.about.ext_description "Krypter veven! Bruk HTTPS-tryggleik automatisk på mange sider."> <!ENTITY https-everywhere.about.version "Versjon"> <!ENTITY https-everywhere.about.created_by "Laga av"> -<!ENTITY https-everywhere.about.and ", and"> +<!ENTITY https-everywhere.about.and ", og"> <!ENTITY https-everywhere.about.librarians "Regelsettbibliotekarar"> <!ENTITY https-everywhere.about.thanks "Takk til"> <!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 8cf7f8973561fcb6bc498bd4d0af0fefae43185d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:15:19 2016 +0000 Update translations for whisperback --- nn/nn.po | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index 412faf0..6614532 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -8,10 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2014-08-26 23:40+0000\n" +"POT-Creation-Date: 2015-12-16 19:54+0100\n" +"PO-Revision-Date: 2016-02-10 15:58+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" -"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,17 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. XXX use a better exception -#: ../whisperBack/whisperback.py:63 +#: ../whisperBack/whisperback.py:56 #, python-format msgid "Invalid contact email: %s" msgstr "Ugyldig kontakt e-post: %s" -#: ../whisperBack/whisperback.py:80 +#: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" msgstr "" -#: ../whisperBack/whisperback.py:82 +#: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" msgstr "" @@ -40,40 +40,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "" -#: ../whisperBack/gui.py:154 +#: ../whisperBack/gui.py:148 msgid "Unable to load a valid configuration." msgstr "" -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:214 msgid "Sending mail..." msgstr "Sender e-post " -#: ../whisperBack/gui.py:221 +#: ../whisperBack/gui.py:215 msgid "Sending mail" msgstr "Sender e-post" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:223 +#: ../whisperBack/gui.py:217 msgid "This could take a while..." msgstr "Dette kan ta ei stund " -#: ../whisperBack/gui.py:237 +#: ../whisperBack/gui.py:232 msgid "The contact email adress doesn't seem valid." msgstr "" -#: ../whisperBack/gui.py:254 +#: ../whisperBack/gui.py:249 msgid "Unable to send the mail: SMTP error." msgstr "" -#: ../whisperBack/gui.py:256 +#: ../whisperBack/gui.py:251 msgid "Unable to connect to the server." msgstr "" -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:253 msgid "Unable to create or to send the mail." msgstr "" -#: ../whisperBack/gui.py:261 +#: ../whisperBack/gui.py:256 msgid "" "\n" "\n" @@ -82,21 +82,20 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "" -#: ../whisperBack/gui.py:274 +#: ../whisperBack/gui.py:269 msgid "Your message has been sent." msgstr "Meldinga di er sendt." -#: ../whisperBack/gui.py:281 +#: ../whisperBack/gui.py:276 msgid "An error occured during encryption." msgstr "" -#: ../whisperBack/gui.py:301 +#: ../whisperBack/gui.py:296 #, python-format msgid "Unable to save %s." msgstr "Klarte ikkje å lagra %s." -#. XXX: fix string -#: ../whisperBack/gui.py:325 +#: ../whisperBack/gui.py:319 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -106,27 +105,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "" -#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "" -#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "" -#: ../whisperBack/gui.py:393 +#: ../whisperBack/gui.py:383 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "" -#: ../whisperBack/gui.py:394 +#: ../whisperBack/gui.py:384 msgid "Tails developers <tails(a)boum.org>" msgstr "" -#: ../whisperBack/gui.py:395 +#: ../whisperBack/gui.py:385 msgid "translator-credits" msgstr "" -#: ../whisperBack/gui.py:422 +#: ../whisperBack/gui.py:412 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr ""

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 1c81631ef522cd072a186d5eb5af4c52e4e69dba Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:15:13 2016 +0000 Update translations for torcheck --- nn/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nn/torcheck.po b/nn/torcheck.po index 932ee21..a6f4523 100644 --- a/nn/torcheck.po +++ b/nn/torcheck.po @@ -2,14 +2,14 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014-2015 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-28 19:01+0000\n" +"PO-Revision-Date: 2016-02-10 16:06+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" -"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,7 +27,7 @@ msgid "" msgstr "Gå til <a href=\"https://www.torproject.org/\">Tor-nettsida</a> for meir informasjon om trygg bruk av Tor. Du kan no fritt surfa anonymt på Internett." msgid "There is a security update available for Tor Browser." -msgstr "" +msgstr "Ei tryggingsoppdatering for Tor-nettlesaren er klar." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 18bade2a77df0dc7bdfe2d8b84c1fdb29f715c2b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:15:02 2016 +0000 Update translations for bridgedb --- nn/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 70184bd..259f1b1 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ 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-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-22 21:34+0000\n" +"PO-Revision-Date: 2016-02-10 16:06+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n"

1 0

[torspec/master] Apply Zhenfei et. al's changes to prop#263.
by isis＠torproject.org 10 Feb '16

10 Feb '16

commit f1fa22bbfd9c28f159b197c50e8b945a4d2ed0c5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 10 14:49:48 2016 +0000 Apply Zhenfei et. al's changes to prop#263. After the following development meeting discussing this proposal: http://meetbot.debian.net/tor-dev/2016/tor-dev.2016-02-04-13.28.html These changes were sent to tor-dev(a)lists.torproject.org: https://lists.torproject.org/pipermail/tor-dev/2016-February/010379.html --- proposals/263-ntru-for-pq-handshake.txt | 79 +++++++++++++++++---------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/proposals/263-ntru-for-pq-handshake.txt b/proposals/263-ntru-for-pq-handshake.txt index 149f0a4..a6732b6 100644 --- a/proposals/263-ntru-for-pq-handshake.txt +++ b/proposals/263-ntru-for-pq-handshake.txt @@ -1,8 +1,8 @@ Filename: 263-ntru-for-pq-handshake.txt -Title: Request to change key exchange protocol for handshake v1.1 +Title: Request to change key exchange protocol for handshake v1.2 Author: John SCHANCK, William WHYTE and Zhenfei ZHANG Created: 29 Aug 2015 -Updated: 9 Jan 2016 +Updated: 4 Feb 2016 Status: Open 1. Introduction @@ -20,11 +20,8 @@ Status: Open 0X0101 ntor+qsh -- refers to this modular design; no specific Key Encapsulation Mechanism (KEM) is assigned. - 0X0101 ntor+ntru -- the quantum safe KEM is based on NTRUEncrypt, with - parameter ntrueess443ep1 - 0X0102 ntor+ntru -- the quantum safe KEM is based on NTRUEncrypt, with - parameter ntrueess743ep1 + parameter ntrueess443ep2 0X0103 ntor+rlwe -- the quantum safe KEM is based on ring learning with error encryption scheme; parameter not specified @@ -97,9 +94,9 @@ Status: Open 2) The proposed key exchange method provides one-way authentication: The server is authenticated, while the client remains anonymous. - 3) The protocol is almost backward compatible with its previous - version: ntor. By omitting a single field, one obtains the exact ntor - protocol. That is, the protocol is at least as secure as ntor. + 3) The protocol is at least as secure as ntor. In the case where the + quantum-safe encryption algorithm fails, the protocol is indentical to + ntor protocol. 2.1.2 General idea: @@ -123,16 +120,14 @@ Status: Open quantum-safe encryption algorithm, and use NTRUEncrypt as our example; **new approach** - 3) HMAC-based Extract-and-Expand Key Derivation Function - KDF-RFC5869; - ##existing approach: See 5.2.2 tor-spec.txt## - Note: a new hash function, SHA3 as in FIPS 202, will be used, rather than - SHA256 as in ntor. + 3) SHA3-256 hash function (see FIPS 202), and SHAKE256 KDF; + ##previous approach: HMAC-based Extract-and-Expand KDF-RFC5869## 2.2 The protocol 2.2.1 Initialization - H(x,t) as HMAC_SHA3 with message x and key t. + H(x,t) as SHA3-256 with message x and key t. H_LENGTH = 32 ID_LENGTH = 20 G_LENGTH = 32 @@ -148,9 +143,9 @@ Status: Open t_verify = PROTOID | ":verify" These three variables define three different cryptographic hash functions: - hash1 = HMAC(*, t_mac); - hash2 = HMAC(*, t_key); - hash3 = HMAC(*, t_verify); + hash1 = H(*, t_mac); + hash2 = H(*, t_key); + hash3 = H(*, t_verify); MULT(A,b) = the multiplication of the curve25519 point 'A' by the scalar 'b'. @@ -194,7 +189,7 @@ Status: Open * PAR_SEC P [H_LENGTH bytes] and computes: -* C = ENCRYPT( P | B, QSPK); +* C = ENCRYPT( P | B | Y, QSPK); Then it uses its ntor private key 'b' to compute an ECC secret E = EXP(X,y) | EXP(X,b) | B | X | Y @@ -212,11 +207,15 @@ Status: Open ================================================================================ The server's handshake reply is: - SERVER_PK Y [G_LENGTH bytes] AUTH H(auth_input, t_mac) [H_LENGTH bytes] * QSCIPHER C [QSPK_LENGTH bytes] + + Note: in previous ntor protocol the server also needs to send +#pre SERVER_PK Y [G_LENGTH bytes] + This value is now encrypted in C, so the server does not need to send Y. + ================================================================================ - The client then checks Y is in G^*, and computes + The client decrypts C, then checks Y is in G^*, and computes E = EXP(Y,x) | EXP(B,x) | B | X | Y * P' = DECRYPT(C, QSSK) @@ -234,23 +233,24 @@ Status: Open The client verifies that AUTH == H(auth_input, t_mac). Both parties now have a shared value for KEY_SEED. This value will be used - during Key Derivation Function - KDF-RFC5869 (see 5.2.2 tor-spec.txt) + during Key Derivation Function. 2.3 Instantiation with NTRUEncrypt - The example uses the NTRU parameter set NTRU_EESS443EP1. This has keys + The example uses the NTRU parameter set NTRU_EESS443EP2. This has keys and ciphertexts of length 610 bytes. This parameter set delivers 128 bits - classical security and quantum security. For 256 bits classical and quantum - security, use NTRU_EESS743EP1. + classical security and quantum security. This parameter set uses product + form NTRU polynomials. For 256 bits classical and quantum security, use + NTRU_EESS743EP2. We adjust the following parameters: handshake type: - 0X0101 ntor+ntru the quantum safe KEM is based on NTRUEncrypt, with - parameter ntrueess443ep1 - PROTOID = "ntor-curve25519-sha3-1-ntrueess443ep1" - QSPK_LENGTH = 610 length of NTRU_EESS439EP1 public key - QSC_LENGTH = 610 length of NTRU_EESS439EP1 cipher + 0X0102 ntor+ntru the quantum safe KEM is based on NTRUEncrypt, with + parameter ntrueess443ep2 + PROTOID = "ntor-curve25519-sha3-1-ntrueess443ep2" + QSPK_LENGTH = 610 length of NTRU_EESS443EP2 public key + QSC_LENGTH = 610 length of NTRU_EESS443EP2 cipher NTRUEncrypt can be adopted in our framework without further modification. @@ -271,7 +271,7 @@ Status: Open 3.3 Cryptographic hash function The default hash function HMAC_SHA256 from Tor suffices to provide desired security for the present day. However, to be more future proof, we - propose to use HMAC_SHA3 when Tor starts to migrate to SHA3. + propose to use SHA3 when Tor starts to migrate to SHA3. 3.4 Key Encapsulation Mechanism The KEM in our protocol can be proved to be KEM-CCA-2 secure. @@ -290,20 +290,23 @@ Status: Open 4. Candidate quantum-safe encryption algorithms - We do not propose any quantum-safe encryption algorithms in this proposal. - This document focuses on the hybrid design. The implementer should modularize - the protocol with appropriate interfaces that allow any quantum-safe - encryption algorithm to be used in this setting. + Two candidate quantum-safe encryption algorithms are under consideration. - Candidate quantum-safe encryption algorithms will be included in another - proposal. This document will refer to the proposal when both proposals are - mature. + NTRUEncrypt, with parameter set ntrueess443ep2 provides 128 bits classcial and + quantum security. The parameter sets is available for use now. + LWE-based key exchange, based on Peikert's idea [Pei14]. Parameter sets + suitable for this framework (the newerhop vairant) is still under development. 5. Bibliography -[DK05] Y. Dodis, J. Katz, "Chosen-Ciphertext Security of Mulitple Encryption", +[DK05] Y. Dodis, J. Katz, "Chosen-Ciphertext Security of Mulitple Encryption", Theory of Cryptography Conference, 2005. http://link.springer.com/chapter/10.1007%2F978-3-540-30576-7_11 (conference version) or http://cs.nyu.edu/~dodis/ps/2enc.pdf (preprint) +[Pei14] C. Peikert, "Lattice Cryptography for the Internet", PQCrypto 2014. + + + +

1 0

[tor-messenger-build/master] Add a patch for trac 17494
by arlo＠torproject.org 10 Feb '16

10 Feb '16

commit 42d8655596792dd173089521e809b4c555dedb0e Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Feb 9 21:04:06 2016 -0800 Add a patch for trac 17494 * Better error reporting for failed outgoing messages. --- ChangeLog | 1 + projects/instantbird/config | 1 + projects/instantbird/trac-17494.patch | 85 +++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/ChangeLog b/ChangeLog index 43ddb54..37f1c45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Tor Messenger -- * Bug 13795: Remove SPI root certificate because Debian no longer ships it * Bug 18094: Remove references to torbutton from start-tor-messenger script * Bug 18235: Disable Facebook as they no longer support XMPP + * Bug 17494: Better error reporting for failed outgoing messages * Mac * Bug 17896: Add Edit menu to the conversation window on OS X * Windows diff --git a/projects/instantbird/config b/projects/instantbird/config index b0fb789..3412ab9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -74,6 +74,7 @@ input_files: - filename: trac-17552.patch - filename: trac-16489.patch - filename: trac-17896.patch + - filename: trac-17494.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch diff --git a/projects/instantbird/trac-17494.patch b/projects/instantbird/trac-17494.patch new file mode 100644 index 0000000..c2f2697 --- /dev/null +++ b/projects/instantbird/trac-17494.patch @@ -0,0 +1,85 @@ + +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1454457891 28800 +# Node ID 4cfc2a04ebe02f53d789c7c27f8c3cd2a40b6483 +# Parent 19694424a48639d4f9ca458e3e891292e0c2ae1e +Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep + +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 +@@ -61,31 +61,33 @@ conversation.error.changeTopicFailedNotA + # %2$S is the text of the message that wasn't delivered. + conversation.error.sendFailedAsNotInRoom=Message could not be sent to %1$S as you are no longer in the room: %2$S + # This is displayed in a conversation as an error message when the user sends + # a message to a room that the recipient is not in. + # %1$S is the jid of the recipient. + # %2$S is the text of the message that wasn't delivered. + conversation.error.sendFailedAsRecipientNotInRoom=Message could not be sent to %1$S as the recipient is no longer in the room: %2$S + # These are displayed in a conversation as a system error message. +-conversation.error.remoteServerNotFound=Could not reach the recipient's server ++conversation.error.remoteServerNotFound=Could not reach the recipient's server. ++conversation.error.unknownSendError=An unknown error occurred on sending this message. ++# %S is the name of the message recipient. ++conversation.error.sendServiceUnavailable=It is not possible to send messages to %S at this time. + # %S is the nick of participant that is not in room. + conversation.error.nickNotInRoom=%S is not in the room. + conversation.error.banCommandAnonymousRoom=You can't ban participants from anonymous rooms. Try /kick instead. + conversation.error.banKickCommandNotAllowed=You don't have the required privileges to remove this participant from the room. + conversation.error.banKickCommandConflict=Sorry, you can't remove yourself from the room. + conversation.error.changeNickFailedConflict=Could not change your nick to %S as this nick is already in use. + conversation.error.changeNickFailedNotAcceptable=Could not change your nick to %S as nicks are locked down in this room. + conversation.error.inviteFailedForbidden=You don't have the required privileges to invite users to this room. + # %S is the jid of user that is invited. + conversation.error.failedJIDNotFound=Could not reach %S. + # %S is the jid that is invalid. + conversation.error.invalidJID=%S is an invalid jid (Jabber identifiers must be of the form user@domain). + conversation.error.commandFailedNotInRoom=You have to rejoin the room to be able to use this command. +-conversation.error.unknownError=Unknown error + + # LOCALIZATION NOTE (tooltip.*): + # These are the titles of lines of information that will appear in + # the tooltip showing details about a contact or conversation. + # LOCALIZATION NOTE (tooltip.status): + # %S will be replaced by the XMPP resource identifier + tooltip.status=Status (%S) + tooltip.statusNoResource=Status +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 +@@ -674,21 +674,28 @@ var XMPPConversationPrototype = { + this._targetResource = this._account._parseJID(from).resource; + let flags = {}; + let error = this._account.parseError(aStanza); + if (error) { + let norm = this._account.normalize(from); + let muc = this._account._mucs.get(norm); + + if (!aMsg) { +- // Failed outgoing message unknown. +- if (error.condition == "remote-server-not-found") +- aMsg = _("conversation.error.remoteServerNotFound"); +- else +- aMsg = _("conversation.error.unknownError"); ++ // Failed outgoing message. ++ switch (error.condition) { ++ case "remote-server-not-found": ++ aMsg = _("conversation.error.remoteServerNotFound"); ++ break; ++ case "service-unavailable": ++ aMsg = _("conversation.error.sendServiceUnavailable", this.shortName); ++ break; ++ default: ++ aMsg = _("conversation.error.unknownSendError"); ++ break; ++ } + } + else if (this._isMucParticipant && muc && !muc.left && + error.condition == "item-not-found") { + // XEP-0045 (7.5): MUC private messages. + // If we try to send to participant not in a room we are in. + aMsg = _("conversation.error.sendFailedAsRecipientNotInRoom", + this._targetResource, aMsg); + } +

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 09 Feb '16

09 Feb '16

commit 3c1b1f3d8d4af37e5768533df0eeac805af2efd7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 9 21:45:22 2016 +0000 Update translations for https_everywhere_completed --- eu/https-everywhere.dtd | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/eu/https-everywhere.dtd b/eu/https-everywhere.dtd index 0bec9f5..e11a721 100644 --- a/eu/https-everywhere.dtd +++ b/eu/https-everywhere.dtd @@ -3,8 +3,11 @@ <!ENTITY https-everywhere.about.ext_description "Weba enkriptatu! Automatikoki erabili HTTPS segurtasuna leku askotan."> <!ENTITY https-everywhere.about.version "Bertsioa"> <!ENTITY https-everywhere.about.created_by "Sortzaileak"> +<!ENTITY https-everywhere.about.and ", eta"> <!ENTITY https-everywhere.about.librarians "Arau-sorta Liburuzainak"> <!ENTITY https-everywhere.about.thanks "Eskerrak"> +<!ENTITY https-everywhere.about.many_contributors "Kolaboratzaile pila, barnean"> +<!ENTITY https-everywhere.about.noscript "Gainera, HTTPS Everywhere-en zenbait zati Giorgio Maone eta beste batzuen NoScript kodean oinarritzen dira. Eskerrak eman nahi dizkiegu beraien lan bikainagatik."> <!ENTITY https-everywhere.about.contribute "HTTPS Everywhere gustoko baduzu, kontutan har zenezake"> <!ENTITY https-everywhere.about.donate_tor "Torera dohaintza eman"> <!ENTITY https-everywhere.about.tor_lang_code "en"> @@ -34,17 +37,7 @@ <!ENTITY https-everywhere.prefs.reset_default "Lehenetsia berrezarri"> <!ENTITY https-everywhere.prefs.view_xml_source "XML Iturria ikusi"> -<!ENTITY https-everywhere.source.downloading "Deskargatzen"> -<!ENTITY https-everywhere.source.filename "Fitxategi izena"> -<!ENTITY https-everywhere.source.unable_to_download "Ezin izan da iturria deskargatu"> - -<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 jakinarazpena"> -<!ENTITY https-everywhere.popup.paragraph1 "Hara! HTTPS Everywhereren bertsio egonkorra erabiltzen ari zinen, baina baliteke nahigabe garapen bertsiora eguneratu izana gure azken argitalpenean."> -<!ENTITY https-everywhere.popup.paragraph2 "Egonkorrera bueltatu nahiko al zenuke?"> -<!ENTITY https-everywhere.popup.paragraph3 "Gustatuko litzaiguke garapen argitalpena erabiltzen jarraitu eta HTTPS Everywhere hobeagoa egiten lagunduko bagintuzu! Han hemen akats gutxi batzuk daudela ikus dezakezu, hauen berri https-everywhere(a)eff.org helbidean eman dezakezu. Barkatu eragozpenak, eta eskerri asko HTTPS Everywhere erabiltzeagatik."> -<!ENTITY https-everywhere.popup.keep "Mantendu nazazu garapen bertsioan"> -<!ENTITY https-everywhere.popup.revert "Deskargatu azken bertsio egonkorra"> - -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere arau-sorta froga"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Utzi"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Abiarazi"> +<!ENTITY https-everywhere.chrome.stable_rules "Arau egonkorrak"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Behartu konexio enkriptatuak webgune hauetan:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Arau esperimentalak"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Alarmak edo kalteak eragin dezake. Ezgaitua lehenetsia.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Feb '16

09 Feb '16

commit 5227f4293228df605f9b5a67866c7dabaafdcc88 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 9 21:45:16 2016 +0000 Update translations for https_everywhere --- eu/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/https-everywhere.dtd b/eu/https-everywhere.dtd index e8ce9af..e11a721 100644 --- a/eu/https-everywhere.dtd +++ b/eu/https-everywhere.dtd @@ -7,7 +7,7 @@ <!ENTITY https-everywhere.about.librarians "Arau-sorta Liburuzainak"> <!ENTITY https-everywhere.about.thanks "Eskerrak"> <!ENTITY https-everywhere.about.many_contributors "Kolaboratzaile pila, barnean"> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> +<!ENTITY https-everywhere.about.noscript "Gainera, HTTPS Everywhere-en zenbait zati Giorgio Maone eta beste batzuen NoScript kodean oinarritzen dira. Eskerrak eman nahi dizkiegu beraien lan bikainagatik."> <!ENTITY https-everywhere.about.contribute "HTTPS Everywhere gustoko baduzu, kontutan har zenezake"> <!ENTITY https-everywhere.about.donate_tor "Torera dohaintza eman"> <!ENTITY https-everywhere.about.tor_lang_code "en">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Feb '16

09 Feb '16

commit b1adb266bb5899f4221cff47f491822d774ff34e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 9 21:15:17 2016 +0000 Update translations for https_everywhere --- eu/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/https-everywhere.dtd b/eu/https-everywhere.dtd index fda46bb..e8ce9af 100644 --- a/eu/https-everywhere.dtd +++ b/eu/https-everywhere.dtd @@ -38,6 +38,6 @@ <!ENTITY https-everywhere.prefs.view_xml_source "XML Iturria ikusi"> <!ENTITY https-everywhere.chrome.stable_rules "Arau egonkorrak"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Behartu konexio enkriptatuak webgune hauetan:"> <!ENTITY https-everywhere.chrome.experimental_rules "Arau esperimentalak"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Alarmak edo kalteak eragin dezake. Ezgaitua lehenetsia.">

1 0