From 2fef14ff7626f2879b2a8de721a03c7e0f7ff9f6 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Tue, 16 Aug 2016 10:19:39 +0200
Subject: Increment version to 1.18. Update user guide PDF file.

---
 Translations/Language.ar.xml                     |   2 +-
 Translations/Language.be.xml                     |   2 +-
 Translations/Language.bg.xml                     |   2 +-
 Translations/Language.ca.xml                     |   2 +-
 Translations/Language.cs.xml                     |   2 +-
 Translations/Language.da.xml                     |   2 +-
 Translations/Language.de.xml                     |   2 +-
 Translations/Language.el.xml                     |   2 +-
 Translations/Language.es.xml                     |   2 +-
 Translations/Language.et.xml                     |   2 +-
 Translations/Language.eu.xml                     |   2 +-
 Translations/Language.fa.xml                     |   2 +-
 Translations/Language.fi.xml                     |   2 +-
 Translations/Language.fr.xml                     |   2 +-
 Translations/Language.hu.xml                     |   2 +-
 Translations/Language.id.xml                     |   2 +-
 Translations/Language.it.xml                     |   2 +-
 Translations/Language.ja.xml                     |   2 +-
 Translations/Language.ka.xml                     |   2 +-
 Translations/Language.ko.xml                     |   2 +-
 Translations/Language.lv.xml                     |   2 +-
 Translations/Language.my.xml                     |   2 +-
 Translations/Language.nl.xml                     |   2 +-
 Translations/Language.nn.xml                     |   2 +-
 Translations/Language.pl.xml                     |   2 +-
 Translations/Language.pt-br.xml                  |   2 +-
 Translations/Language.ru.xml                     |   2 +-
 Translations/Language.sk.xml                     |   2 +-
 Translations/Language.sl.xml                     |   2 +-
 Translations/Language.sv.xml                     |   2 +-
 Translations/Language.tr.xml                     |   2 +-
 Translations/Language.uk.xml                     |   2 +-
 Translations/Language.uz.xml                     |   2 +-
 Translations/Language.vi.xml                     |   2 +-
 Translations/Language.zh-cn.xml                  |   2 +-
 Translations/Language.zh-hk.xml                  |   2 +-
 Translations/Language.zh-tw.xml                  |   2 +-
 doc/VeraCrypt User Guide.odt                     | Bin 2263552 -> 2264677 bytes
 src/Build/Resources/MacOSX/Info.plist.xml        |   2 +-
 src/Common/Tcdefs.h                              |   8 ++++----
 src/Driver/Driver.rc                             |   8 ++++----
 src/ExpandVolume/ExpandVolume.rc                 |  20 ++++++++++----------
 src/Format/Format.rc                             |  18 +++++++++---------
 src/Mount/Mount.rc                               |   8 ++++----
 src/Release/Setup Files/VeraCrypt User Guide.pdf | Bin 2870952 -> 2891405 bytes
 src/Setup/MacOSX/veracrypt.pkgproj               |   4 ++--
 src/Setup/Setup.rc                               |  16 ++++++++--------
 src/Signing/sign.bat                             |   4 ++--
 src/Signing/sign_test.bat                        |   4 ++--
 49 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml
index 5c8b3767..f070740e 100644
--- a/Translations/Language.ar.xml
+++ b/Translations/Language.ar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ar" name="العربية" en-name="Arabic" version="0.2.0" translators="Ahmad Gharbeia, Khaled Hosny, Ali Khojah" />
     <!-- Fonts -->
diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml
index 9fd2730d..85720fba 100644
--- a/Translations/Language.be.xml
+++ b/Translations/Language.be.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="be" name="Беларуская" en-name="Belarusian" version="0.1.0" translators="Aleg Azarousky" />
     <!-- Fonts -->
diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml
index e9ebb2c4..32e7b145 100644
--- a/Translations/Language.bg.xml
+++ b/Translations/Language.bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="bg" name="Български" en-name="Bulgarian" version="0.1.0" translators="Lachezar Gorchev" />
     <!-- Fonts -->
diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml
index 6ab87116..8823e543 100644
--- a/Translations/Language.ca.xml
+++ b/Translations/Language.ca.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ca" name="Català" en-name="Catalan" version="0.1.0" translators="CESICAT, Centre de Seguretat de la Informació de Catalunya" />
     <!-- Fonts -->
diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml
index b77cac4f..90704d95 100644
--- a/Translations/Language.cs.xml
+++ b/Translations/Language.cs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="cs" name="Čeština" en-name="Czech" version="1.0.0" translators="Vítek Moser" />
     <!-- Fonts -->
diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml
index bd94c808..f343fa99 100644
--- a/Translations/Language.da.xml
+++ b/Translations/Language.da.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="da" name="Dansk" en-name="Danish" version="0.1.0" translators="Lasse Bond" />
     <!-- Fonts -->
diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml
index 3479db44..16b8377f 100644
--- a/Translations/Language.de.xml
+++ b/Translations/Language.de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="de" name="Deutsch" en-name="German" version="1.1.8" translators="Harry Haller, Alexander Schorg, Simon Frankenberger, David Arndt, H. Sauer, Dulla, Ettore Atalan, Matthias Kolja Miehl" />
     <!-- Fonts -->
diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml
index 78f21258..4fce6e80 100644
--- a/Translations/Language.el.xml
+++ b/Translations/Language.el.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="el" name="Ελληνικά" en-name="Greek" version="0.1.0" translators="Βασίλης Κοσμίδης" />
     <!-- Fonts -->
diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml
index 6b0cf197..c8b651c4 100644
--- a/Translations/Language.es.xml
+++ b/Translations/Language.es.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="es" name="Español" en-name="Spanish" version="1.0.0" translators="Juan Antonio Auñón Ochando" />
     <!-- Fonts -->
diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml
index 1f890081..fa70525c 100644
--- a/Translations/Language.et.xml
+++ b/Translations/Language.et.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="et" name="Eesti" en-name="Estonian" version="0.1.0" translators="Maiko Mõtsar" />
     <!-- Fonts -->
diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml
index 54af9ffa..58218a99 100644
--- a/Translations/Language.eu.xml
+++ b/Translations/Language.eu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="eu" name="Euskara" en-name="Basque" version="1.0.0" translators="Ander Genua" />
     <!-- Fonts -->
diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml
index 6b43c42a..45f08553 100644
--- a/Translations/Language.fa.xml
+++ b/Translations/Language.fa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="fa" name="فارسي" en-name="Persian" version="0.1.0" translators="Ali Bitazar, Rodabeh Sarmadi" />
     <!-- Fonts -->
diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml
index 6d2fccdf..560854d3 100644
--- a/Translations/Language.fi.xml
+++ b/Translations/Language.fi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="fi" name="Suomi" en-name="Finnish" version="0.1.0" translators="Matti Ruhanen" />
     <!-- Fonts -->
diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml
index a07fe6dc..65c89d9c 100644
--- a/Translations/Language.fr.xml
+++ b/Translations/Language.fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="fr" name="Français" en-name="French" version="0.3.0" translators="Stéphane S., Olivier M., Thierry T" />
     <!-- Fonts -->
diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml
index 2afd9e31..a756f23e 100644
--- a/Translations/Language.hu.xml
+++ b/Translations/Language.hu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="hu" name="Magyar" en-name="Hungarian" version="0.1.0" translators="Nyul Balazs" />
     <!-- Fonts -->
diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml
index bfedba5d..478ee023 100644
--- a/Translations/Language.id.xml
+++ b/Translations/Language.id.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="id" name="Bahasa Indonesia" en-name="Indonesian" version="0.1.0" translators="Tajuddin N. F." />
     <!-- Fonts -->
diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml
index c21397c5..fb4d9292 100644
--- a/Translations/Language.it.xml
+++ b/Translations/Language.it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="it" name="Italiano" en-name="Italian" version="1.0.1" translators="Maurizio Ballo, Consiglio Gaetano" />
     <!-- Fonts -->
diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml
index 4f1d70b3..cfcdaf48 100644
--- a/Translations/Language.ja.xml
+++ b/Translations/Language.ja.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ja" name="日本語" en-name="Japanese" version="1.0.0" translators="OGOSHI Masayuki" />
     <!-- Fonts -->
diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml
index 40766836..8867219c 100644
--- a/Translations/Language.ka.xml
+++ b/Translations/Language.ka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ka" name="ქართული" en-name="Georgian" version="0.1.0" translators="Kakha Lomiashvili" />
     <!-- Fonts -->
diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml
index 3605cee2..42a4b01a 100644
--- a/Translations/Language.ko.xml
+++ b/Translations/Language.ko.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ko" name="한국어" en-name="Korean" version="0.1.1" translators="Kim Young, Herbert Shin" />
     <!-- Fonts -->
diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml
index abd6f625..197b009e 100644
--- a/Translations/Language.lv.xml
+++ b/Translations/Language.lv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="lv" name="Latviešu" en-name="Latvian" version="0.1.0" translators="Edmunds Melkers" />
     <!-- Fonts -->
diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml
index 4348aabd..15e86631 100644
--- a/Translations/Language.my.xml
+++ b/Translations/Language.my.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="my" name="မြန်မာ" en-name="Burmese" version="1.0.0" translators="Zaw Myo Htet" />
     <!-- Fonts -->
diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml
index 843879a7..d1d6349a 100644
--- a/Translations/Language.nl.xml
+++ b/Translations/Language.nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="nl" name="Nederlands" en-name="Dutch" version="0.2.1" translators="Jan van der Wal, Peter Tak" />
     <!-- Fonts -->
diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml
index c3388609..06504d69 100644
--- a/Translations/Language.nn.xml
+++ b/Translations/Language.nn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="nn" name="Norsk Nynorsk" en-name="Norwegian (Nynorsk)" version="0.1.0" translators="Kjell Rune Helland" />
     <!-- Fonts -->
diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml
index be784479..f1e37750 100644
--- a/Translations/Language.pl.xml
+++ b/Translations/Language.pl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="pl" name="Polski" en-name="Polish" version="1.0.0" translators="Mirek Druchowicz, Janusz Zamecki, Sobiesław Antolak, Begina Felicysym" />
     <!-- Fonts -->
diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml
index 0ee174ea..88e10943 100644
--- a/Translations/Language.pt-br.xml
+++ b/Translations/Language.pt-br.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="pt-br" name="Português-Brasil" en-name="Portuguese (Brazil)" version="0.1.0" translators="Thiago C. L. Mendes, Lecidio S. Alencar , Lucas C. Ferreira" />
     <!-- Fonts -->
diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml
index 56b30ac3..738c332c 100644
--- a/Translations/Language.ru.xml
+++ b/Translations/Language.ru.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ru" name="Русский" en-name="Russian" version="1.0.0" translators="Dmitry Yerokhin" />
     <!-- Fonts -->
diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml
index 2a670edc..945508b9 100644
--- a/Translations/Language.sk.xml
+++ b/Translations/Language.sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="sk" name="Slovenčina" en-name="Slovak" version="0.1.0" translators="Kamil David" />
     <!-- Fonts -->
diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml
index 3be5ea28..d3b97fbd 100644
--- a/Translations/Language.sl.xml
+++ b/Translations/Language.sl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="sl" name="Slovenščina" en-name="Slovenian" version="0.1.0" translators="Erik David Salam" />
     <!-- Fonts -->
diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml
index 6aaa2c8e..b011dd14 100644
--- a/Translations/Language.sv.xml
+++ b/Translations/Language.sv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="sv" name="Svenska" en-name="Swedish" version="1.0.0" translators="Peter Runesson" />
     <!-- Fonts -->
diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml
index 38416cd6..e74492c0 100644
--- a/Translations/Language.tr.xml
+++ b/Translations/Language.tr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="tr" name="Türkçe" en-name="Turkish" version="0.1.0" translators="Ali İskender Turan, Zeynel Abidin Öztürk" />
     <!-- Fonts -->
diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml
index a8d7a1e5..ca735191 100644
--- a/Translations/Language.uk.xml
+++ b/Translations/Language.uk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="uk" name="Українська" en-name="Ukrainian" version="1.0.0" translators="Kravchuk Olexandr, Babchuk Volodymyr" />
     <!-- Fonts -->
diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml
index 5bd9ac51..3c88d66f 100644
--- a/Translations/Language.uz.xml
+++ b/Translations/Language.uz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="uz" name="Ўзбекча" en-name="Uzbek (Cyrillic)" version="0.1.0" translators="Abdurauf Azizov, Dmitry Yerokhin" />
     <!-- Fonts -->
diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml
index 527219b7..aa9af0c3 100644
--- a/Translations/Language.vi.xml
+++ b/Translations/Language.vi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="vi" name="Tiếng Việt" en-name="Vietnamese" version="0.1.0" translators="Nguyễn Kim Huy" />
     <!-- Fonts -->
diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml
index 9d0464a1..efa33fb9 100644
--- a/Translations/Language.zh-cn.xml
+++ b/Translations/Language.zh-cn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li and Zhangjintao" />
     <!-- Fonts -->
diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml
index 1f48e4ff..f579cb54 100644
--- a/Translations/Language.zh-hk.xml
+++ b/Translations/Language.zh-hk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="zh-hk" name="繁體中文" en-name="Chinese (Hong Kong)" version="0.1.0" translators="PUN Chi Ho" />
     <!-- Fonts -->
diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml
index d0d1723f..792ed10f 100644
--- a/Translations/Language.zh-tw.xml
+++ b/Translations/Language.zh-tw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.17">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="zh-tw" name="繁體中文" en-name="Chinese (Taiwan)" version="0.1.0" translators="Barney Li, Simon Ma, ChangMing Hsu" />
     <!-- Fonts -->
diff --git a/doc/VeraCrypt User Guide.odt b/doc/VeraCrypt User Guide.odt
index 0069394c..542ef8d0 100644
Binary files a/doc/VeraCrypt User Guide.odt and b/doc/VeraCrypt User Guide.odt differ
diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml
index fb2fc40f..193bba66 100644
--- a/src/Build/Resources/MacOSX/Info.plist.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.xml
@@ -27,7 +27,7 @@
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.17.22</string>
+	<string>1.18.13</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index a58df2e3..a3bee8c3 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -55,15 +55,15 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
 #define TC_APP_NAME						"VeraCrypt"
 
 // Version displayed to user 
-#define VERSION_STRING					"1.18-BETA9"
+#define VERSION_STRING					"1.18"
 
 // Version number to compare against driver
-#define VERSION_NUM						0x0117
+#define VERSION_NUM						0x0118
 
 // Release date
-#define TC_STR_RELEASE_DATE			L"May 29th, 2016"
+#define TC_STR_RELEASE_DATE			L"August 16th, 2016"
 #define TC_RELEASE_DATE_YEAR			2016
-#define TC_RELEASE_DATE_MONTH			 5
+#define TC_RELEASE_DATE_MONTH			 8
 
 #define BYTES_PER_KB                    1024LL
 #define BYTES_PER_MB                    1048576LL
diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc
index a3f177a5..305762cf 100644
--- a/src/Driver/Driver.rc
+++ b/src/Driver/Driver.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,17,22,0
- PRODUCTVERSION 1,17,22,0
+ FILEVERSION 1,18,13,0
+ PRODUCTVERSION 1,18,13,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,11 +45,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Driver"
-            VALUE "FileVersion", "1.17"
+            VALUE "FileVersion", "1.18"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "veracrypt.sys"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.17"
+            VALUE "ProductVersion", "1.18"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc
index 6659d0f3..fb3d9db8 100644
--- a/src/ExpandVolume/ExpandVolume.rc
+++ b/src/ExpandVolume/ExpandVolume.rc
@@ -141,7 +141,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO 
 BEGIN
     IDD_SIZE_DIALOG, DIALOG
     BEGIN
@@ -192,8 +192,8 @@ IDR_MOUNT_RSRC_HEADER   HEADER                  "resource.h"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,17,22,0
- PRODUCTVERSION 1,17,22,0
+ FILEVERSION 1,18,13,0
+ PRODUCTVERSION 1,18,13,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -210,11 +210,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Expander"
-            VALUE "FileVersion", "1.17"
+            VALUE "FileVersion", "1.18"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCryptExpander.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.17"
+            VALUE "ProductVersion", "1.18"
         END
     END
     BLOCK "VarFileInfo"
@@ -230,19 +230,19 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "#include ""..\\\\common\\\\resource.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE
+3 TEXTINCLUDE 
 BEGIN
     "#include ""..\\\\common\\\\common.rc""\r\n"
     "\0"
@@ -264,7 +264,7 @@ IDB_LOGO_288DPI         BITMAP                  "Logo_288dpi.bmp"
 // Menu
 //
 
-IDR_MENU MENUEX
+IDR_MENU MENUEX 
 BEGIN
     MENUITEM "About",                       IDM_ABOUT,MFT_STRING,MFS_ENABLED
     MENUITEM "Homepage",                    IDM_HOMEPAGE,MFT_STRING | MFT_RIGHTJUSTIFY,MFS_ENABLED
@@ -276,7 +276,7 @@ END
 // String Table
 //
 
-STRINGTABLE
+STRINGTABLE 
 BEGIN
     IDS_UACSTRING           "VeraCrypt Expander"
 END
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index eb2fcfa0..d06d0ef1 100644
--- a/src/Format/Format.rc
+++ b/src/Format/Format.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,17,22,0
- PRODUCTVERSION 1,17,22,0
+ FILEVERSION 1,18,13,0
+ PRODUCTVERSION 1,18,13,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Format"
-            VALUE "FileVersion", "1.17"
+            VALUE "FileVersion", "1.18"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt Format.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.17"
+            VALUE "ProductVersion", "1.18"
         END
     END
     BLOCK "VarFileInfo"
@@ -459,19 +459,19 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "#include ""..\\\\common\\\\resource.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE
+3 TEXTINCLUDE 
 BEGIN
     "#include ""..\\\\common\\\\common.rc""\r\n"
     "\0"
@@ -486,7 +486,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO 
 BEGIN
     IDD_VOL_CREATION_WIZARD_DLG, DIALOG
     BEGIN
@@ -725,7 +725,7 @@ IDB_WIZARD              BITMAP                  "VeraCrypt_wizard.bmp"
 // String Table
 //
 
-STRINGTABLE
+STRINGTABLE 
 BEGIN
     IDS_UACSTRING_FMT       "VeraCrypt"
 END
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index d45f83fa..8bd5f27b 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -522,8 +522,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,17,22,0
- PRODUCTVERSION 1,17,22,0
+ FILEVERSION 1,18,13,0
+ PRODUCTVERSION 1,18,13,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -540,11 +540,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt"
-            VALUE "FileVersion", "1.17"
+            VALUE "FileVersion", "1.18"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.17"
+            VALUE "ProductVersion", "1.18"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/Release/Setup Files/VeraCrypt User Guide.pdf b/src/Release/Setup Files/VeraCrypt User Guide.pdf
index cfb84000..70ab6b24 100644
Binary files a/src/Release/Setup Files/VeraCrypt User Guide.pdf and b/src/Release/Setup Files/VeraCrypt User Guide.pdf differ
diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index ecf06615..589c1fb9 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -495,7 +495,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.17.22</string>
+				<string>1.18.13</string>
 			</dict>
 			<key>UUID</key>
 			<string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string>
@@ -1051,7 +1051,7 @@ Merci de ré-installer OSXFUSE et de cocher l'option de compatibilité MacFUSE d
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>VeraCrypt 1.17</string>
+			<string>VeraCrypt 1.18</string>
 		</dict>
 	</dict>
 	<key>SHARED_GLOBAL_DATA</key>
diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc
index 47d1d149..8e30131a 100644
--- a/src/Setup/Setup.rc
+++ b/src/Setup/Setup.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,17,22,0
- PRODUCTVERSION 1,17,22,0
+ FILEVERSION 1,18,13,0
+ PRODUCTVERSION 1,18,13,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Setup"
-            VALUE "FileVersion", "1.17"
+            VALUE "FileVersion", "1.18"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt Setup.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.17"
+            VALUE "ProductVersion", "1.18"
         END
     END
     BLOCK "VarFileInfo"
@@ -201,19 +201,19 @@ IDI_SETUP               ICON                    "Setup.ico"
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "#include ""..\\\\common\\\\resource.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE
+3 TEXTINCLUDE 
 BEGIN
     "#include ""..\\\\common\\\\common.rc""\r\n"
     "\0"
@@ -228,7 +228,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO 
 BEGIN
     IDD_UNINSTALL, DIALOG
     BEGIN
diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index a163dac5..29d04551 100644
--- a/src/Signing/sign.bat
+++ b/src/Signing/sign.bat
@@ -20,8 +20,8 @@ del *.xml
 cd "..\..\Signing"
 
 rem sign using SHA-1
-signtool sign /v /a /n IDRIX /i Thawte /ac Thawt_CodeSigning_CA.crt /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.17.exe"
+signtool sign /v /a /n IDRIX /i Thawte /ac Thawt_CodeSigning_CA.crt /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.18.exe"
 rem sign using SHA-256
-signtool sign /v /a /n "IDRIX SARL" /i GlobalSign /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Release\Setup Files\VeraCrypt Setup 1.17.exe"
+signtool sign /v /a /n "IDRIX SARL" /i GlobalSign /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Release\Setup Files\VeraCrypt Setup 1.18.exe"
 
 pause
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index eb9c492a..02e6166c 100644
--- a/src/Signing/sign_test.bat
+++ b/src/Signing/sign_test.bat
@@ -24,9 +24,9 @@ del *.xml
 cd "..\..\Signing"
 
 rem sign using SHA-1
-signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.17.exe"
+signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.18.exe"
 
 rem sign using SHA-256
-signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Release\Setup Files\VeraCrypt Setup 1.17.exe"
+signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 "..\Release\Setup Files\VeraCrypt Setup 1.18.exe"
 
 pause
\ No newline at end of file
-- 
cgit v1.2.3