[debian-edu-commits] debian-edu/ 25/50: Merge tag 'upstream/1.14'

[Unit 193]

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

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit 61cb34d32891bdcae48ec90a183cf0732b401dd8
Merge: 913cfeb f3b50d6
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Sat Sep 19 16:51:34 2015 -0400

    Merge tag 'upstream/1.14'
    
    Upstream version 1.14
    
    # gpg: Signature made Sat 19 Sep 2015 04:51:32 PM EDT using RSA key ID EBE9BD91
    # gpg: Good signature from "Unit 193 <unit193 at gmail.com>"
    # gpg:                 aka "Unit 193 <unit193 at ninthfloor.org>"
    # gpg:                 aka "Unit 193 <unit193 at ubuntu.com>"
    # gpg:                 aka "Unit 193 <unit193 at ninthfloor.com>"

 Translations/Language.ar.xml                     |  24 +-
 Translations/Language.be.xml                     |  24 +-
 Translations/Language.bg.xml                     |  24 +-
 Translations/Language.ca.xml                     |  22 +-
 Translations/Language.cs.xml                     |  24 +-
 Translations/Language.da.xml                     |  24 +-
 Translations/Language.de.xml                     |  24 +-
 Translations/Language.el.xml                     |  24 +-
 Translations/Language.es.xml                     |  22 +-
 Translations/Language.et.xml                     |  24 +-
 Translations/Language.eu.xml                     |  22 +-
 Translations/Language.fa.xml                     |  24 +-
 Translations/Language.fi.xml                     |  22 +-
 Translations/Language.fr.xml                     | 174 ++---
 Translations/Language.hu.xml                     |  24 +-
 Translations/Language.id.xml                     |  24 +-
 Translations/Language.it.xml                     |  24 +-
 Translations/Language.ja.xml                     |  24 +-
 Translations/Language.ka.xml                     |  24 +-
 Translations/Language.ko.xml                     |  24 +-
 Translations/Language.lv.xml                     |  24 +-
 Translations/Language.my.xml                     |  24 +-
 Translations/Language.nl.xml                     |  24 +-
 Translations/Language.nn.xml                     | 210 ++++---
 Translations/Language.pl.xml                     |  22 +-
 Translations/Language.pt-br.xml                  |  24 +-
 Translations/Language.ru.xml                     |  24 +-
 Translations/Language.sk.xml                     |  24 +-
 Translations/Language.sl.xml                     |  24 +-
 Translations/Language.sv.xml                     |  22 +-
 Translations/Language.tr.xml                     |  24 +-
 Translations/Language.uk.xml                     |  24 +-
 Translations/Language.uz.xml                     |  24 +-
 Translations/Language.vi.xml                     |  24 +-
 Translations/Language.zh-cn.xml                  |  22 +-
 Translations/Language.zh-hk.xml                  |  22 +-
 Translations/Language.zh-tw.xml                  |  24 +-
 src/Boot/Windows/BootCommon.h                    |   2 +-
 src/Boot/Windows/BootDefs.h                      |   6 +-
 src/Boot/Windows/BootMain.cpp                    |   9 +-
 src/Boot/Windows/BootSector.asm                  |   5 +-
 src/Boot/Windows/Makefile                        |   4 +
 src/Build/Resources/MacOSX/Info.plist.xml        |   2 +-
 src/Common/Apidrvr.h                             |   7 +
 src/Common/BootEncryption.cpp                    | 107 +++-
 src/Common/BootEncryption.h                      |   4 +-
 src/Common/Common.h                              |   1 +
 src/Common/Common.rc                             |  36 +-
 src/Common/Crypto.c                              |   4 +-
 src/Common/Dlgcode.c                             | 343 ++++++++--
 src/Common/Dlgcode.h                             |   6 +
 src/Common/Format.c                              |  24 +-
 src/Common/Format.h                              |   4 +-
 src/Common/Keyfiles.c                            |  31 +-
 src/Common/Keyfiles.h                            |   3 +-
 src/Common/Language.c                            |   4 +-
 src/Common/Language.xml                          |  26 +-
 src/Common/Password.c                            |   6 +-
 src/Common/Password.h                            |   2 +-
 src/Common/Resource.h                            |   4 +-
 src/Common/Tcdefs.h                              |   8 +-
 src/Driver/Driver.rc                             |   8 +-
 src/Driver/Ntdriver.c                            | 143 ++++-
 src/Driver/Ntdriver.h                            |   3 +
 src/Driver/Ntvol.c                               |   3 +
 src/ExpandVolume/DlgExpandVolume.cpp             |   6 +-
 src/ExpandVolume/ExpandVolume.rc                 |   8 +-
 src/ExpandVolume/WinMain.cpp                     |  23 +-
 src/Format/Format.rc                             |  19 +-
 src/Format/Resource.h                            |   3 +-
 src/Format/Tcformat.c                            | 518 ++++++++++++---
 src/Format/Tcformat.h                            |   2 +-
 src/Main/CommandLineInterface.cpp                |  15 +-
 src/Main/Forms/Forms.cpp                         |  15 +-
 src/Main/Forms/Forms.h                           |   2 +
 src/Main/Forms/TrueCrypt.fbp                     | 103 ++-
 src/Main/Forms/VolumePasswordPanel.cpp           |  39 +-
 src/Main/Forms/VolumePasswordPanel.h             |   1 +
 src/Main/Forms/VolumePimWizardPage.cpp           |  50 +-
 src/Main/Forms/VolumePimWizardPage.h             |   4 +-
 src/Main/UserInterface.cpp                       |  14 +-
 src/Main/UserPreferences.h                       |   2 +
 src/Mount/Favorites.cpp                          |  28 +-
 src/Mount/Favorites.h                            |   6 +-
 src/Mount/Hotkeys.c                              |  76 ++-
 src/Mount/Mount.c                                | 768 ++++++++++++++++-------
 src/Mount/Mount.h                                |   2 +-
 src/Mount/Mount.rc                               | 103 +--
 src/Mount/Resource.h                             |  10 +-
 src/Readme.txt                                   |   1 +
 src/Release/Setup Files/VeraCrypt User Guide.pdf | Bin 2873305 -> 2970461 bytes
 src/Setup/MacOSX/veracrypt.pkgproj               |   4 +-
 src/Setup/Setup.c                                | 193 +++++-
 src/Setup/Setup.h                                |   6 +
 src/Setup/Setup.rc                               |   8 +-
 src/Signing/sign.bat                             |   2 +-
 src/Signing/sign_test.bat                        |   2 +-
 97 files changed, 3078 insertions(+), 968 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git