From e727676a1ea612b9a024dc95ca7760f7f4391a6b Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 19 Feb 2016 09:27:41 +0000
Subject: [PATCH] IDE: compiler options: added mode delphiunicode and iso

git-svn-id: trunk@51663 -
---
 ide/frames/compiler_parsing_options.pas | 20 ++++++++++++++------
 ide/lazarusidestrconsts.pas             |  4 ----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ide/frames/compiler_parsing_options.pas b/ide/frames/compiler_parsing_options.pas
index 4aebdc936a..8d14e8ce7e 100644
--- a/ide/frames/compiler_parsing_options.pas
+++ b/ide/frames/compiler_parsing_options.pas
@@ -36,13 +36,17 @@ begin
   if CompareText(Mode, 'ObjFPC') = 0 then
     Result := lisObjectPascalDefault + ' (-Mobjfpc)'
   else if CompareText(Mode, 'Delphi') = 0 then
-    Result := lisDelphi + ' (-Mdelphi)'
+    Result := 'Delphi (-Mdelphi)'
+  else if CompareText(Mode, 'DelphiUnicode') = 0 then
+    Result := 'DelphiUnicode (-Mdelphiunicode)'
   else if CompareText(Mode, 'tp') = 0 then
-    Result := lisTurboPascal + ' (-Mtp)'
+    Result := 'Turbo Pascal (-Mtp)'
   else if CompareText(Mode, 'fpc') = 0 then
-    Result := lisFreePascal + ' (-Mfpc)'
+    Result := 'Free Pascal (-Mfpc)'
   else if CompareText(Mode, 'macpas') = 0 then
-    Result := lisMacPascal + ' (-Mmacpas)'
+    Result := 'Mac Pascal (-Mmacpas)'
+  else if CompareText(Mode, 'iso') = 0 then
+    Result := 'ISO/IEC 7185 Pascal (-Miso)'
   else
     Result := '';
 end;
@@ -51,12 +55,16 @@ function CaptionToSyntaxMode(const Caption: string): string;
 begin
   if Pos('-Mdelphi', Caption) > 0 then
     Result := 'Delphi'
+  else if Pos('-Mdelphiunicode', Caption) > 0 then
+    Result := 'delphiunicode'
+  else if Pos('-Mfpc', Caption) > 0 then
+    Result := 'fpc'
   else if Pos('-Mtp', Caption) > 0 then
     Result := 'tp'
   else if Pos('-Mmacpas', Caption) > 0 then
     Result := 'macpas'
-  else if Pos('-Mfpc', Caption) > 0 then
-    Result := 'fpc'
+  else if Pos('-Miso', Caption) > 0 then
+    Result := 'iso'
   else
     Result := 'ObjFPC';
 end;
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 958ae99773..058cec962d 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -5431,10 +5431,6 @@ resourcestring
   lisUseAnsistrings = 'Use Ansistrings';
   lisDoNotShowThisDialogForThisProject = 'Do not show this dialog for this project';
   lisObjectPascalDefault = 'Object Pascal - default';
-  lisDelphi = 'Delphi';
-  lisTurboPascal = 'Turbo Pascal';
-  lisMacPascal = 'Mac Pascal';
-  lisFreePascal = 'Free Pascal';
   lisVerifyMethodCalls = 'Verify method calls';
   lisToggleShowingFilenamesWithFullPathOrWithRelativePa = 'Toggle showing '
     +'filenames with full path or with relative path';