[Pkg-privacy-commits] [ricochet-im] 02/04: Merge tag 'upstream/1.1.4'

[Sascha Steinbiss]

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

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

commit 05a43c7d020684fed2a925decd0f3825d4ad83b7
Merge: 03dc3bf 476d8bc
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Nov 18 21:12:56 2016 +0000

    Merge tag 'upstream/1.1.4'
    
    Upstream version 1.1.4
    
    # gpg: Signature made Fri Nov 18 21:12:56 2016 UTC
    # gpg:                using RSA key E8D37AE2F09F4872
    # gpg: Good signature from "Sascha Steinbiss <satta at tetrinetsucht.de>" [ultimate]
    # gpg:                 aka "Sascha Steinbiss <sascha at steinbiss.name>" [ultimate]
    # gpg:                 aka "Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>" [ultimate]
    # gpg:                 aka "Sascha Steinbiss <ss34 at sanger.ac.uk>" [ultimate]

 BUILDING.md                                        |   4 +-
 LICENSE                                            |   2 +-
 README.md                                          |   4 +-
 packaging/installer/building.txt                   |   3 +-
 packaging/installer/installer.iss                  |  48 +--
 packaging/installer/prepare.bat                    |   5 +
 protobuf.pri                                       |   2 +-
 ricochet.pro                                       |  22 +-
 ricochetscreen.png                                 | Bin 0 -> 54918 bytes
 src/main.cpp                                       |   9 +-
 src/ui/LanguagesModel.cpp                          |  15 +
 src/ui/LanguagesModel.h                            |   5 +
 src/ui/qml/GeneralPreferences.qml                  |  40 +++
 src/ui/qml/LanguagePreferences.qml                 |  62 ----
 src/ui/qml/MessageDelegate.qml                     |  14 +-
 src/ui/qml/PreferencesDialog.qml                   |   5 -
 src/ui/qml/qml.qrc                                 |   1 -
 src/utils/CryptoKey.cpp                            |  20 +-
 src/utils/SecureRNG.cpp                            |   2 +-
 translation/embedded.qrc                           |   6 +
 translation/inno/Albanian.isl                      | 321 +++++++++++++++++++
 translation/inno/Estonian.isl                      | 341 +++++++++++++++++++++
 translation/installer_de.isl                       |   2 +-
 translation/installer_et_EE.isl                    |  14 +
 translation/installer_it_IT.isl                    |  14 +
 translation/installer_nb.isl                       |  14 +
 translation/installer_pt_PT.isl                    |  14 +
 translation/installer_ru.isl                       |   4 +-
 translation/installer_sq.isl                       |  14 +
 translation/installer_zh_HK.isl                    |  14 +
 translation/ricochet_bg.ts                         |  81 ++---
 translation/ricochet_cs.ts                         |  95 +++---
 translation/ricochet_da.ts                         |  81 ++---
 translation/ricochet_de.ts                         |  81 ++---
 translation/ricochet_en.ts                         |  74 ++---
 translation/ricochet_es.ts                         |  81 ++---
 translation/{ricochet_da.ts => ricochet_et_EE.ts}  | 307 ++++++++++---------
 translation/ricochet_fi.ts                         |  81 ++---
 translation/ricochet_fil_PH.ts                     |  74 ++---
 translation/ricochet_fr.ts                         |  81 ++---
 translation/ricochet_he.ts                         | 193 ++++++------
 translation/ricochet_it.ts                         |  81 ++---
 translation/{ricochet_it.ts => ricochet_it_IT.ts}  | 183 +++++------
 translation/{ricochet_da.ts => ricochet_nb.ts}     | 277 +++++++++--------
 translation/ricochet_nl_NL.ts                      |  81 ++---
 translation/ricochet_pl.ts                         |  81 ++---
 translation/ricochet_pt_BR.ts                      |  81 ++---
 .../{ricochet_pt_BR.ts => ricochet_pt_PT.ts}       | 177 ++++++-----
 translation/ricochet_ru.ts                         |  74 ++---
 translation/ricochet_sl.ts                         | 193 ++++++------
 translation/{ricochet_sv.ts => ricochet_sq.ts}     | 307 ++++++++++---------
 translation/ricochet_sv.ts                         |  81 ++---
 translation/ricochet_tr.ts                         |  83 ++---
 translation/ricochet_uk.ts                         |  81 ++---
 translation/ricochet_zh.ts                         | 207 +++++++------
 translation/{ricochet_da.ts => ricochet_zh_HK.ts}  | 309 ++++++++++---------
 56 files changed, 2740 insertions(+), 1806 deletions(-)

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