Merge branch 'is-6' into compiler-update

# Conflicts:
#	whatsnew.htm

.gitignore

@@ -1,6 +1,4 @@
 c.bat
 compilesettings.bat
 setup-sign.bat
-C[Vv][Ss]
-.cvsignore
-Output
+Output

Files/Languages/BrazilianPortuguese.isl

@@ -71,7 +71,7 @@ WindowsVersionNotSupported=Este programa n
 WindowsServicePackRequired=Este programa requer o %1 Service Pack %2 ou superior.
 NotOnThisPlatform=Este programa não executará no %1.
 OnlyOnThisPlatform=Este programa deve ser executado no %1.
-OnlyOnTheseArchitectures=Este programa só pode ser instalado em versões do Windows projetadas para as seguintes arquiteturas de processadores:%n%n% 1
+OnlyOnTheseArchitectures=Este programa só pode ser instalado em versões do Windows projetadas para as seguintes arquiteturas de processadores:%n%n%1
 MissingWOW64APIs=A versão do Windows que você está executando não inclui a funcionalidade requerida pelo Instalador pra realizar uma instalação de 64 bits. Pra corrigir este problema, por favor instale o Service Pack %1.
 WinVersionTooLowError=Este programa requer a %1 versão %2 ou superior.
 WinVersionTooHighError=Este programa não pode ser instalado na %1 versão %2 ou superior.

Files/Languages/Dutch.isl

@@ -81,7 +81,7 @@ ButtonNewFolder=&Nieuwe map maken
 
 ; *** "Select Language" dialog messages
 SelectLanguageTitle=Taalkeuze voor Setup
-SelectLanguageLabel=Selecteer de taal welke Setup gebruikt tijdens de installatie:
+SelectLanguageLabel=Selecteer de taal die Setup gebruikt tijdens de installatie:
 
 ; *** Common wizard text
 ClickNext=Klik op Volgende om verder te gaan of op Annuleren om Setup af te sluiten.

Files/Languages/Polish.isl

@@ -288,7 +288,7 @@ ErrorRestartingComputer=Instalator nie m
 ; *** Uninstaller messages
 UninstallNotFound=Plik "%1" nie istnieje. Nie można przeprowadzić dezinstalacji.
 UninstallOpenError=Plik "%1" nie mógł zostać otwarty. Nie można przeprowadzić dezinstalacji.
-UninstallUnsupportedVer=Ta wersja programu dezinstalacyjnego nie rozpoznaje formatu logu dezinstalacji w pliku "%1%". Nie można przeprowadzić dezinstalacji.
+UninstallUnsupportedVer=Ta wersja programu dezinstalacyjnego nie rozpoznaje formatu logu dezinstalacji w pliku "%1". Nie można przeprowadzić dezinstalacji.
 UninstallUnknownEntry=W logu dezinstalacji wystšpiła nieznana pozycja (%1)
 ConfirmUninstall=Czy na pewno chcesz usunšć aplikację %1 i wszystkie jej składniki?
 UninstallOnlyOnWin64=Ta aplikacja może być odinstalowana tylko w 64-bitowej wersji systemu Windows.

Files/Languages/Unofficial/Kurdish.isl

@@ -338,5 +338,5 @@ LaunchProgram=Bernameya %1 Bixebit
 AssocFileExtension=Direjeyên dosya %2 ê ji %1 va hev bîne
 AssocingFileExtension=Direjeyên dosya %2 ê ji %1 va têyî hevhanîn...
 AutoStartProgramGroupDescription = Destpêk:
-AutoStartProgram = % 1 otomatîk dikarî dest pê bikî
-AddonHostProgramNotFound =% 1 peldanka bijartî cîh tune.% N% nDîsajî dixwazî bidomînî?
+AutoStartProgram = %1 otomatîk dikarî dest pê bikî
+AddonHostProgramNotFound =%1 peldanka bijartî cîh tune.% N% nDîsajî dixwazî bidomînî?

Files/Languages/Unofficial/Thai.isl

@@ -60,7 +60,7 @@ WindowsServicePackRequired=
 NotOnThisPlatform=脩춘≥졸旅幄瓮彖拈 尸촛볶 %1.
 OnlyOnThisPlatform=脩춘≥졸旅 들系롭㎾밤뮨克� %1.
 OnlyOnTheseArchitectures=脩춘≥졸旅杆죠철둣뉘駱㎯� Windows 쵤癰롱琓棨梳봐路沓총뵘뚝뿌돠≥쳅♨㎂배픈뼙僅픕셔닌㏊琓餓밌�:%n%n%1
-MissingWOW64APIs=쵤癰♨� Windows 롱筽卍丞于쬔巍쥡ⓖ先濚들系죵⌒춤ら㎾밟는둣뉘駱㏅액琓롭⌒천都둘蓼梳� 64 - bit 旋羸孤于㎕櫓聖藕♤琦開밌羽뼙뉘都둘蓼 Service Pack 1%.
+MissingWOW64APIs=쵤癰♨� Windows 롱筽卍丞于쬔巍쥡ⓖ先濚들系죵⌒춤ら㎾밟는둣뉘駱㏅액琓롭⌒천都둘蓼梳� 64 - bit 旋羸孤于㎕櫓聖藕♤琦開밌羽뼙뉘都둘蓼 Service Pack %1.
 WinVersionTooLowError=脩춘≥졸旅들系⌒쳉克� %1 璿稿履酪� %2 塏勒試쥡′脘
 WinVersionTooHighError=脩춘≥졸旅幄椀怒櫓� 둣뉘駱㎯뮨克� %1 璿稿履酪� %2 塏勒試쥡′脘
 AdminPrivilegesRequired=ㅨ났于㎯ら USER ♨㏈无다笑촛볶夕癰 administrator 宣戾孤都둘蓼脩춘≥졸旅.
@@ -299,8 +299,8 @@ ErrorRestartingComputer=
 ; *** Uninstaller messages
 UninstallNotFound=岳톺 "%1" 幄窪� 幄椀怒櫓뗏□텃　櫓둣뉘駱㏛닻
 UninstallOpenError=岳톺 "%1" 幄椀怒櫓뜩뿔담ら芽� 롭試藕쥡杆죠철 징瑄棹⌒쳔㎮뼙聖쳅芽�
-UninstallUnsupportedVer=똴묀櫓둣뉘駱㎭욥졺箕롸� "% 1" 睾撫尸쵬삔볶幄巍닻총벙櫓쫌좍紀ⓕ≥陌� uninstaller 밌� 幄椀怒櫓떰攷⌒천都둘蓼
-UninstallUnknownEntry=촤징櫓롱巍쥡쵬蟯朞 (1%) 芽傭蔑씌尸炤溶붇뭍煉♨㎕櫓똴묀櫓둣뉘駱�
+UninstallUnsupportedVer=똴묀櫓둣뉘駱㎭욥졺箕롸� "%1" 睾撫尸쵬삔볶幄巍닻총벙櫓쫌좍紀ⓕ≥陌� uninstaller 밌� 幄椀怒櫓떰攷⌒천都둘蓼
+UninstallUnknownEntry=촤징櫓롱巍쥡쵬蟯朞 (%1) 芽傭蔑씌尸炤溶붇뭍煉♨㎕櫓똴묀櫓둣뉘駱�
 ConfirmUninstall=ㅨ났于㎕櫓징瑄棹⌒천都둘蓼  %1 笑芹完뭘촛￥볜駱㎂졍?
 UninstallOnlyOnWin64=⌒천都둘蓼밌鎔怒櫓떰攷⌒천都둘蓼복 64 - bit Windows 釋脘밂埇.
 OnlyAdminCanUninstall=ㅨ났于㏅사� 솝辱錨택克� (Administrator) ⓙ㎤芹怒櫓뗏□텃　櫓둣뉘駱㎮뼙聖쳅밌藕닻

ISHelp/isetup.xml

@@ -5400,6 +5400,7 @@ SignTool=byparam format c:
 <tr><td>10.0.15063</td><td>Windows 10 Version 1703 (Creators Update)</td></tr>
 <tr><td>10.0.16299</td><td>Windows 10 Version 1709 (Fall Creators Update)</td></tr>
 <tr><td>10.0.17134</td><td>Windows 10 Version 1803 (April 2018 Update)</td></tr>
+<tr><td>10.0.17763</td><td>Windows 10 Version 1809 (October 2018 Update)</td></tr>
 </table>
 <p>Note that there is normally no need to specify the build numbers (i.e., you may simply use "6.2" for Windows 8).</p>
 </body>

Projects/ISPP/Help/ispp.xml

@@ -242,8 +242,8 @@
 				</syntax>
 				<description>
 					<para>Includes the &translation; of the specified file.</para>
-					<para>If the filename is enclosed in angle brackets, ISPP first searches for the file in the directory where current file resides, then in the directory where the file that included current file resides, and so on. If the file is not found, it is searched on current include path, set via &pragma;, then on the path specified by INCLUDE environment variable.</para>
-					<para>If filename is an expression or specified in quotes, it is searched on current include path only.</para>
+					<para>If the filename is enclosed in quotes, ISPP first searches for the file in the directory where current file resides, then in the directory where the file that included current file resides, and so on. If the file is not found, it is searched on current include path, set via &pragma;, then on the path specified by INCLUDE environment variable.</para>
+					<para>If filename is an expression or specified in angle brackets, it is searched on current include path only.</para>
           <para>The filename may be prefixed by "compiler:", in which case it looks for the file in the Compiler directory.</para>
 					<para>This directive cannot be used inline.</para>
 				</description>

whatsnew.htm

@@ -106,7 +106,7 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
 <li>Minor tweaks.</li>
 </ul>
 
-<p>Contributions via <a href="https://github.com/jrsoftware/issrc" target="_blank">GitHub</a>: Thanks to jogo-, Martin Prikryl, dscharrer, Kleuter, Gavin Lambert, Stef&aacute;n &Ouml;rvar Sigmundsson, and DRON for their contributions.</p>
+<p>Contributions via <a href="https://github.com/jrsoftware/issrc" target="_blank">GitHub</a>: Thanks to jogo-, Martin Prikryl, dscharrer, Kleuter, Gavin Lambert, Stef&aacute;n &Ouml;rvar Sigmundsson, DRON, and Kevin Puetz for their contributions.</p>
 
 <p>Some messages have been added in this version: (<a href="https://github.com/jrsoftware/issrc/commit/b0cd1a0177b818e36734026c67dc24f01ad6a0d0">View differences in Default.isl</a>).</p>
 <ul>