[Pkg-privacy-commits] [ricochet-im] 02/05: Merge tag 'upstream/1.1.2'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository ricochet-im.

commit 2877e56000b7d45c312ee141b7a3b3516a703793
Merge: 6e8077b 3411f0c
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Feb 19 18:19:04 2016 +0100

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2
    
    # gpg: Signature made Fri 19 Feb 2016 18:19:04 CET
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at debian.org>" [ultimate]
    # gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin at gmx.com>" [ultimate]

 BUILDING.md                                    |   8 +-
 README.md                                      |  12 +-
 contrib/usr.bin.ricochet-apparmor              |   1 +
 doc/protocol.md                                |   4 +-
 icons/LICENSE                                  |  11 +-
 packaging/installer/installer.iss              |   2 +
 packaging/linux-static/content/README          |   7 +-
 ricochet.pro                                   |   7 +-
 src/core/ContactUser.cpp                       |  32 +--
 src/core/ContactUser.h                         |  10 +-
 src/core/ConversationModel.cpp                 |   6 +-
 src/core/IncomingRequestManager.cpp            |  27 +-
 src/core/IncomingRequestManager.h              |   2 +-
 src/core/OutgoingContactRequest.cpp            |   4 +-
 src/core/OutgoingContactRequest.h              |   2 +-
 src/core/UserIdentity.cpp                      |  49 ++--
 src/core/UserIdentity.h                        |   7 +
 src/main.cpp                                   |   2 +-
 src/protocol/Connection.cpp                    |  12 +-
 src/protocol/Connection.h                      |   2 +-
 src/protocol/ContactRequestChannel.cpp         |   7 +-
 src/protocol/OutboundConnector.cpp             |  30 +--
 src/protocol/OutboundConnector.h               |  10 +-
 src/tor/TorSocket.cpp                          |   4 +
 src/ui/MainWindow.cpp                          |  42 +++
 src/ui/qml/AddContactDialog.qml                |  12 +-
 src/ui/qml/Bubble.qml                          |   3 +
 src/ui/qml/ChatPage.qml                        |   2 +
 src/ui/qml/ChatWindow.qml                      |   7 +-
 src/ui/qml/ContactIDField.qml                  |   3 +-
 src/ui/qml/ContactList.qml                     |   1 +
 src/ui/qml/ContactListDelegate.qml             |   1 +
 src/ui/qml/ContactPreferences.qml              |   5 +
 src/ui/qml/ContactRequestDialog.qml            |  12 +-
 src/ui/qml/ContactRequestFields.qml            |   1 +
 src/ui/qml/MainWindow.qml                      |   7 +-
 src/ui/qml/MessageDelegate.qml                 |   1 +
 src/ui/qml/MessageDialogWrapper.qml            |   5 +-
 src/ui/qml/NetworkSetupWizard.qml              |   7 +-
 src/ui/qml/OpenBrowserDialog.qml               |   3 +-
 src/ui/qml/PreferencesDialog.qml               |  12 +-
 src/ui/qml/TorBootstrapStatus.qml              |   1 +
 src/ui/qml/TorLogDisplay.qml                   |   1 +
 src/ui/qml/TorPreferences.qml                  |   5 +-
 src/ui/qml/main.qml                            |   4 +-
 src/ui/qml/qml.qrc                             |   1 +
 src/ui/qml/utils.js                            |  11 +
 translation/embedded.qrc                       |   3 +
 translation/inno/ChineseSimplified.isl         | 337 +++++++++++++++++++++++++
 translation/installer_fi.isl                   |   4 +-
 translation/installer_sl.isl                   |  14 +
 translation/installer_zh.isl                   |  14 +
 translation/ricochet_bg.ts                     | 110 ++++----
 translation/ricochet_cs.ts                     | 110 ++++----
 translation/ricochet_da.ts                     | 110 ++++----
 translation/ricochet_de.ts                     | 110 ++++----
 translation/ricochet_en.ts                     | 110 ++++----
 translation/ricochet_es.ts                     | 110 ++++----
 translation/ricochet_fi.ts                     | 110 ++++----
 translation/ricochet_fil_PH.ts                 | 110 ++++----
 translation/ricochet_fr.ts                     | 110 ++++----
 translation/{ricochet_da.ts => ricochet_he.ts} | 244 +++++++++---------
 translation/ricochet_it.ts                     | 124 ++++-----
 translation/ricochet_nl_NL.ts                  | 110 ++++----
 translation/ricochet_pl.ts                     | 110 ++++----
 translation/ricochet_pt_BR.ts                  | 110 ++++----
 translation/ricochet_ru.ts                     | 110 ++++----
 translation/{ricochet_da.ts => ricochet_sl.ts} | 242 +++++++++---------
 translation/ricochet_sv.ts                     | 136 +++++-----
 translation/ricochet_tr.ts                     | 200 +++++++--------
 translation/ricochet_uk.ts                     | 110 ++++----
 translation/{ricochet_en.ts => ricochet_zh.ts} | 248 +++++++++---------
 72 files changed, 2000 insertions(+), 1511 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/ricochet-im.git