Merged revision(s) 53325 #31944eda39, 53341 #46b3e668d7 from trunk:

IDE: project options: more values for Win Vista DPI awarness. Issue #30170, modified patch by AlexeyT
........
IDE: Regenerated translations and updated Russian translation
........

git-svn-id: branches/fixes_1_6@53359 -

ide/frames/project_application_options.lfm

@@ -15,7 +15,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
     Width = 487
     Align = alTop
     Caption = 'AppSettingsGroupBox'
-    ClientHeight = 449
+    ClientHeight = 450
     ClientWidth = 483
     TabOrder = 0
     object TitleLabel: TLabel
@@ -23,9 +23,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = TitleEdit
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 10
-      Width = 51
+      Height = 17
+      Top = 11
+      Width = 67
       BorderSpacing.Left = 6
       Caption = 'TitleLabel'
       ParentColor = False
@@ -34,9 +34,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideLeft.Control = AppSettingsGroupBox
       AnchorSideTop.Control = IconPanel
       Left = 6
-      Height = 15
-      Top = 35
-      Width = 51
+      Height = 17
+      Top = 39
+      Width = 65
       BorderSpacing.Left = 6
       Caption = 'IconLabel'
       ParentColor = False
@@ -48,9 +48,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = IconTrack
       Left = 240
-      Height = 15
-      Top = 176
-      Width = 80
+      Height = 17
+      Top = 182
+      Width = 101
       BorderSpacing.Left = 6
       BorderSpacing.Right = 6
       Caption = 'IconTrackLabel'
@@ -58,7 +58,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
     end
     object TitleEdit: TEdit
       Left = 106
-      Height = 23
+      Height = 27
       Top = 6
       Width = 371
       Align = alTop
@@ -72,9 +72,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = DarwinDividerBevel
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 337
-      Width = 150
+      Height = 24
+      Top = 381
+      Width = 191
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       Caption = 'UseAppBundleCheckBox'
@@ -85,9 +85,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = WindowsDividerBevel
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 224
-      Width = 151
+      Height = 24
+      Top = 236
+      Width = 195
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       Caption = 'UseXPManifestCheckBox'
@@ -100,7 +100,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 106
       Height = 128
-      Top = 35
+      Top = 39
       Width = 128
       BorderSpacing.Left = 106
       BorderSpacing.Top = 6
@@ -108,14 +108,14 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       BevelOuter = bvNone
       BorderWidth = 1
       BorderStyle = bsSingle
-      ClientHeight = 124
-      ClientWidth = 124
+      ClientHeight = 126
+      ClientWidth = 126
       TabOrder = 1
       object IconImage: TImage
         Left = 1
-        Height = 122
+        Height = 124
         Top = 1
-        Width = 122
+        Width = 124
         Align = alClient
         Center = True
         OnPictureChanged = IconImagePictureChanged
@@ -128,9 +128,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideBottom.Control = IconPanel
       AnchorSideBottom.Side = asrBottom
       Left = 240
-      Height = 25
-      Top = 35
-      Width = 111
+      Height = 29
+      Top = 39
+      Width = 120
       AutoSize = True
       BorderSpacing.Left = 6
       Caption = 'LoadIconButton'
@@ -142,9 +142,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = DefaultIconButton
       AnchorSideTop.Side = asrBottom
       Left = 240
-      Height = 25
-      Top = 97
-      Width = 109
+      Height = 29
+      Top = 109
+      Width = 117
       AutoSize = True
       BorderSpacing.Top = 6
       Caption = 'SaveIconButton'
@@ -156,9 +156,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = SaveIconButton
       AnchorSideTop.Side = asrBottom
       Left = 240
-      Height = 25
-      Top = 128
-      Width = 112
+      Height = 29
+      Top = 144
+      Width = 121
       AutoSize = True
       BorderSpacing.Top = 6
       Caption = 'ClearIconButton'
@@ -172,8 +172,8 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideRight.Control = IconPanel
       AnchorSideRight.Side = asrBottom
       Left = 106
-      Height = 40
-      Top = 163
+      Height = 46
+      Top = 167
       Width = 128
       Max = 0
       OnChange = IconTrackChange
@@ -182,55 +182,40 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 2
     end
-    object DpiAwareCheckBox: TCheckBox
-      AnchorSideLeft.Control = UseXPManifestCheckBox
-      AnchorSideTop.Control = UseXPManifestCheckBox
-      AnchorSideTop.Side = asrBottom
-      Left = 27
-      Height = 19
-      Top = 246
-      Width = 123
-      BorderSpacing.Left = 21
-      BorderSpacing.Top = 3
-      Caption = 'DpiAwareCheckBox'
-      TabOrder = 8
-    end
     object UIAccessCheckBox: TCheckBox
-      AnchorSideLeft.Control = DpiAwareCheckBox
       AnchorSideTop.Control = ExecutionLevelComboBox
       AnchorSideTop.Side = asrBottom
       Left = 27
-      Height = 19
-      Top = 294
-      Width = 119
+      Height = 24
+      Top = 331
+      Width = 152
       BorderSpacing.Top = 3
       Caption = 'UIAccessCheckBox'
       TabOrder = 10
     end
     object ExecutionLevelComboBox: TComboBox
-      AnchorSideLeft.Control = ExecutionLevelLabel
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = DpiAwareCheckBox
+      AnchorSideLeft.Control = DpiAwareComboBox
+      AnchorSideTop.Control = DpiAwareComboBox
       AnchorSideTop.Side = asrBottom
-      Left = 139
-      Height = 23
-      Top = 268
-      Width = 338
+      AnchorSideRight.Control = DpiAwareComboBox
+      AnchorSideRight.Side = asrBottom
+      Left = 195
+      Height = 31
+      Top = 297
+      Width = 282
       Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.Left = 6
       BorderSpacing.Top = 3
-      ItemHeight = 15
+      ItemHeight = 0
       Style = csDropDownList
       TabOrder = 9
     end
     object ExecutionLevelLabel: TLabel
-      AnchorSideLeft.Control = DpiAwareCheckBox
       AnchorSideTop.Control = ExecutionLevelComboBox
       AnchorSideTop.Side = asrCenter
       Left = 27
-      Height = 15
-      Top = 272
-      Width = 106
+      Height = 17
+      Top = 304
+      Width = 138
       Caption = 'ExecutionLevelLabel'
       ParentColor = False
     end
@@ -239,9 +224,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = LoadIconButton
       AnchorSideTop.Side = asrBottom
       Left = 240
-      Height = 25
-      Top = 66
-      Width = 123
+      Height = 29
+      Top = 74
+      Width = 136
       AutoSize = True
       BorderSpacing.Top = 6
       Caption = 'DefaultIconButton'
@@ -252,8 +237,8 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = IconTrack
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 15
-      Top = 206
+      Height = 17
+      Top = 216
       Width = 471
       Caption = 'For Windows'
       Anchors = [akTop, akLeft, akRight]
@@ -265,8 +250,8 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = UIAccessCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 15
-      Top = 319
+      Height = 17
+      Top = 361
       Width = 471
       Caption = 'For Darwin'
       Anchors = [akTop, akLeft, akRight]
@@ -279,9 +264,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = UseAppBundleCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 27
-      Height = 25
-      Top = 362
-      Width = 155
+      Height = 29
+      Top = 411
+      Width = 177
       AutoSize = True
       BorderSpacing.Left = 21
       BorderSpacing.Top = 6
@@ -289,6 +274,37 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       OnClick = CreateAppBundleButtonClick
       TabOrder = 12
     end
+    object DpiAwareLabel: TLabel
+      AnchorSideLeft.Control = UseXPManifestCheckBox
+      AnchorSideTop.Control = DpiAwareComboBox
+      AnchorSideTop.Side = asrCenter
+      Left = 27
+      Height = 17
+      Top = 270
+      Width = 103
+      BorderSpacing.Left = 21
+      BorderSpacing.Top = 3
+      Caption = 'DpiAwareLabel'
+      ParentColor = False
+    end
+    object DpiAwareComboBox: TComboBox
+      AnchorSideLeft.Control = ExecutionLevelLabel
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = UseXPManifestCheckBox
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = TitleEdit
+      AnchorSideRight.Side = asrBottom
+      Left = 195
+      Height = 31
+      Top = 263
+      Width = 282
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 30
+      BorderSpacing.Top = 3
+      ItemHeight = 0
+      Style = csDropDownList
+      TabOrder = 8
+    end
   end
   object OpenPictureDialog1: TOpenPictureDialog
     left = 385

ide/frames/project_application_options.pas

@@ -18,11 +18,12 @@ type
     AppSettingsGroupBox: TGroupBox;
     CreateAppBundleButton: TBitBtn;
     DefaultIconButton: TButton;
+    DpiAwareLabel: TLabel;
+    DpiAwareComboBox: TComboBox;
     WindowsDividerBevel: TDividerBevel;
     DarwinDividerBevel: TDividerBevel;
     UIAccessCheckBox: TCheckBox;
     ExecutionLevelComboBox: TComboBox;
-    DpiAwareCheckBox: TCheckBox;
     ClearIconButton: TBitBtn;
     IconImage: TImage;
     IconLabel: TLabel;
@@ -172,7 +173,8 @@ end;
 
 procedure TProjectApplicationOptionsFrame.UseXPManifestCheckBoxChange(Sender: TObject);
 begin
-  DpiAwareCheckBox.Enabled := UseXPManifestCheckBox.Checked;
+  DpiAwareLabel.Enabled := UseXPManifestCheckBox.Checked;
+  DpiAwareComboBox.Enabled := UseXPManifestCheckBox.Checked;
   ExecutionLevelLabel.Enabled := UseXPManifestCheckBox.Checked;
   ExecutionLevelComboBox.Enabled := UseXPManifestCheckBox.Checked;
   UIAccessCheckBox.Enabled := UseXPManifestCheckBox.Checked;
@@ -209,6 +211,8 @@ end;
 procedure TProjectApplicationOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
 var
   ExecutionLevel: TXPManifestExecutionLevel;
+  DpiLevel: TXPManifestDpiAware;
+  DpiLevelNames: array[TXPManifestDpiAware] of string;
 begin
   AppSettingsGroupBox.Caption := dlgApplicationSettings;
   TitleLabel.Caption := dlgPOTitle;
@@ -219,10 +223,18 @@ begin
   // Windows specific, Manifest
   WindowsDividerBevel.Caption := lisForWindows;
   UseXPManifestCheckBox.Caption := dlgPOUseManifest;
-  DpiAwareCheckBox.Caption := dlgPODpiAware;
+
+  DpiAwareLabel.Caption := dlgPODpiAwareness;
+  DpiLevelNames[xmdaFalse] := dlgPODpiAwarenessOff;
+  DpiLevelNames[xmdaTrue] := dlgPODpiAwarenessOn;
+  DpiLevelNames[xmdaPerMonitor] := dlgPODpiAwarenessOldOffNewPerMonitor;
+  DpiLevelNames[xmdaTruePM] := dlgPODpiAwarenessOldOnNewPerMonitor;
+
   ExecutionLevelLabel.Caption := dlgPOExecutionLevel;
-  for ExecutionLevel := Low(TXPManifestExecutionLevel) to High(TXPManifestExecutionLevel) do
+  for ExecutionLevel in TXPManifestExecutionLevel do
     ExecutionLevelComboBox.Items.Add(ExecutionLevelToCaption[ExecutionLevel]^);
+  for DpiLevel in TXPManifestDpiAware do
+    DpiAwareComboBox.Items.Add(DpiLevelNames[DpiLevel] + ' (' + ManifestDpiAwareValues[DpiLevel] + ')');
   UIAccessCheckBox.Caption := dlgPOUIAccess;
 
   // Darwin specific, Application Bundle
@@ -258,11 +270,12 @@ begin
     with ProjResources.XPManifest do
     begin
       UseXPManifestCheckBox.Checked := UseManifest;
-      DpiAwareCheckBox.Checked := DpiAware;
+      DpiAwareComboBox.ItemIndex := Ord(DpiAware);
       ExecutionLevelComboBox.ItemIndex := Ord(ExecutionLevel);
       UIAccessCheckBox.Checked := UIAccess;
     end;
-    DpiAwareCheckBox.Enabled := UseXPManifestCheckBox.Checked;
+    DpiAwareLabel.Enabled := UseXPManifestCheckBox.Checked;
+    DpiAwareComboBox.Enabled := UseXPManifestCheckBox.Checked;
     ExecutionLevelLabel.Enabled := UseXPManifestCheckBox.Checked;
     ExecutionLevelComboBox.Enabled := UseXPManifestCheckBox.Checked;
     UIAccessCheckBox.Enabled := UseXPManifestCheckBox.Checked;
@@ -296,7 +309,7 @@ begin
     with ProjResources.XPManifest do
     begin
       UseManifest := UseXPManifestCheckBox.Checked;
-      DpiAware := DpiAwareCheckBox.Checked;
+      DpiAware := TXPManifestDpiAware(DpiAwareComboBox.ItemIndex);
       ExecutionLevel := TXPManifestExecutionLevel(ExecutionLevelComboBox.ItemIndex);
       UIAccess := UIAccessCheckBox.Checked;
     end;

ide/lazarusidestrconsts.pas

@@ -2496,7 +2496,11 @@ resourcestring
   dlgPOUseAppBundle = 'Use Application Bundle for running and debugging';
   dlgPOCreateAppBundle = 'Create Application Bundle';
   dlgPOUseManifest = 'Use manifest file to enable themes';
-  dlgPODpiAware = 'Enabled DPI Awareness (for Vista+)';
+  dlgPODpiAwareness = 'DPI awareness';
+  dlgPODpiAwarenessOff = 'off';
+  dlgPODpiAwarenessOn = 'on';
+  dlgPODpiAwarenessOldOffNewPerMonitor = 'Vista-8: off, 8.1+: per monitor';
+  dlgPODpiAwarenessOldOnNewPerMonitor = 'Vista-8: on, 8.1+: per monitor';
   dlgPOUIAccess = 'UI Access (uiAccess)';
   dlgPOAsInvoker = 'as invoker (asInvoker)';
   dlgPOHighestAvailable = 'highest available (highestAvailable)';

ide/project.pp

@@ -1122,7 +1122,7 @@ function dbgs(Flags: TUnitInfoFlags): string; overload;
 implementation
 
 const
-  ProjectInfoFileVersion = 9;
+  ProjectInfoFileVersion = 10;
   ProjOptionsPath = 'ProjectOptions/';
 
 

ide/w32manifest.pas

@@ -48,15 +48,23 @@ type
     xmelRequireAdministrator
   );
 
+  TXPManifestDpiAware = (
+    xmdaFalse,
+    xmdaTrue,
+    xmdaPerMonitor,
+    xmdaTruePM
+  );
+
+type
   { TProjectXPManifest }
 
   TProjectXPManifest = class(TAbstractProjectResource)
   private
     FExecutionLevel: TXPManifestExecutionLevel;
-    FIsDpiaAware: boolean;
+    FDpiAware: TXPManifestDpiAware;
     FUIAccess: Boolean;
     FUseManifest: boolean;
-    procedure SetDpiAware(const AValue: boolean);
+    procedure SetDpiAware(AValue: TXPManifestDpiAware);
     procedure SetExecutionLevel(AValue: TXPManifestExecutionLevel);
     procedure SetUIAccess(AValue: Boolean);
     procedure SetUseManifest(const AValue: boolean);
@@ -67,7 +75,7 @@ type
     procedure ReadFromProjectFile(AConfig: {TXMLConfig}TObject; Path: String); override;
 
     property UseManifest: boolean read FUseManifest write SetUseManifest;
-    property DpiAware: boolean read FIsDpiaAware write SetDpiAware;
+    property DpiAware: TXPManifestDpiAware read FDpiAware write SetDpiAware;
     property ExecutionLevel: TXPManifestExecutionLevel read FExecutionLevel write SetExecutionLevel;
     property UIAccess: Boolean read FUIAccess write SetUIAccess;
   end;
@@ -78,10 +86,18 @@ const
     'highestAvailable',
     'requireAdministrator'
   );
+
+  ManifestDpiAwareValues: array[TXPManifestDpiAware] of string = (
+    'False',
+    'True',
+    'Per-monitor',
+    'True/PM'
+  );
+
 implementation
 
 const
-  sManifestFileDataStart: String =
+  sManifestFileData: String =
     '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'#$D#$A+
     '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">'#$D#$A+
     ' <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="CompanyName.ProductName.YourApp" type="win32"/>'#$D#$A+
@@ -111,15 +127,27 @@ const
     '   <!-- Windows 10 -->'#$D#$A+
     '   <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />'#$D#$A+
     '   </application>'#$D#$A+
-    '  </compatibility>'#$D#$A;
-  sManifestFileDataEnd: String =
-    '</assembly>';
-  sManifestFileDataDpiAware: String =
+    '  </compatibility>'#$D#$A+
     ' <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">'#$D#$A+
     '  <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">'#$D#$A+
-    '   <dpiAware>true</dpiAware>'#$D#$A+
+    '   <dpiAware>%s</dpiAware>'#$D#$A+
     '  </asmv3:windowsSettings>'#$D#$A+
-    ' </asmv3:application>'#$D#$A;
+    ' </asmv3:application>'#$D#$A+
+    '</assembly>';
+
+function StrToXPManifestDpiAware(const s: string): TXPManifestDpiAware;
+begin
+  for Result:=Low(TXPManifestDpiAware) to High(TXPManifestDpiAware) do
+    if CompareText(s,ManifestDpiAwareValues[Result])=0 then exit;
+  Result:=xmdaFalse;
+end;
+
+function StrToXPManifestExecutionLevel(const s: string): TXPManifestExecutionLevel;
+begin
+  for Result:=Low(TXPManifestExecutionLevel) to High(TXPManifestExecutionLevel) do
+    if CompareText(s,ExecutionLevelToStr[Result])=0 then exit;
+  Result:=xmelAsInvoker;
+end;
 
 procedure TProjectXPManifest.SetUseManifest(const AValue: boolean);
 begin
@@ -128,10 +156,10 @@ begin
   Modified := True;
 end;
 
-procedure TProjectXPManifest.SetDpiAware(const AValue: boolean);
+procedure TProjectXPManifest.SetDpiAware(AValue: TXPManifestDpiAware);
 begin
-  if FIsDpiaAware = AValue then exit;
-  FIsDpiaAware := AValue;
+  if FDpiAware = AValue then Exit;
+  FDpiAware := AValue;
   Modified := True;
 end;
 
@@ -154,7 +182,7 @@ begin
   inherited Create;
   FIsDefaultOption := True;
   UseManifest := False;
-  DpiAware := False;
+  DpiAware := xmdaFalse;
   ExecutionLevel := xmelAsInvoker;
   UIAccess := False;
 end;
@@ -174,10 +202,10 @@ begin
     Res := TGenericResource.Create(RType, RName);
     RType.Free; //no longer needed
     RName.Free;
-    ManifestFileData := Format(sManifestFileDataStart, [ExecutionLevelToStr[ExecutionLevel], BoolToStr(UIAccess, 'true', 'false')]);
-    if DpiAware then
-      ManifestFileData := ManifestFileData + sManifestFileDataDpiAware;
-    ManifestFileData := ManifestFileData + sManifestFileDataEnd;
+    ManifestFileData := Format(sManifestFileData, [
+      ExecutionLevelToStr[ExecutionLevel],
+      BoolToStr(UIAccess, 'true', 'false'),
+      ManifestDpiAwareValues[DpiAware]]);
     Res.RawData.Write(ManifestFileData[1], Length(ManifestFileData));
     AResources.AddSystemResource(Res);
   end;
@@ -186,17 +214,33 @@ end;
 procedure TProjectXPManifest.WriteToProjectFile(AConfig: TObject; Path: String);
 begin
   TXMLConfig(AConfig).SetDeleteValue(Path+'General/UseXPManifest/Value', UseManifest, False);
-  TXMLConfig(AConfig).SetDeleteValue(Path+'General/XPManifest/DpiAware/Value', DpiAware, False);
-  TXMLConfig(AConfig).SetDeleteValue(Path+'General/XPManifest/ExecutionLevel/Value', Ord(ExecutionLevel), 0);
+  TXMLConfig(AConfig).SetDeleteValue(Path+'General/XPManifest/DpiAware/Value', ManifestDpiAwareValues[DpiAware], ManifestDpiAwareValues[xmdaFalse]);
+  TXMLConfig(AConfig).SetDeleteValue(Path+'General/XPManifest/ExecutionLevel/Value', ExecutionLevelToStr[ExecutionLevel], ExecutionLevelToStr[xmelAsInvoker]);
   TXMLConfig(AConfig).SetDeleteValue(Path+'General/XPManifest/UIAccess/Value', UIAccess, False);
 end;
 
 procedure TProjectXPManifest.ReadFromProjectFile(AConfig: TObject; Path: String);
+var
+  Cfg: TXMLConfig;
 begin
-  UseManifest := TXMLConfig(AConfig).GetValue(Path+'General/UseXPManifest/Value', False);
-  DpiAware := TXMLConfig(AConfig).GetValue(Path+'General/XPManifest/DpiAware/Value', False);
-  ExecutionLevel := TXPManifestExecutionLevel(TXMLConfig(AConfig).GetValue(Path+'General/XPManifest/ExecutionLevel/Value', 0));
-  UIAccess := TXMLConfig(AConfig).GetValue(Path+'General/XPManifest/UIAccess/Value', False);
+  Cfg := TXMLConfig(AConfig);
+  UseManifest := Cfg.GetValue(Path+'General/UseXPManifest/Value', False);
+
+  //support prev values "True/False"
+  if Cfg.GetValue(Path+'Version/Value',0)<=9 then
+  begin
+    if Cfg.GetValue(Path+'General/XPManifest/DpiAware/Value', False) then
+      DpiAware := xmdaTrue
+    else
+      DpiAware := xmdaFalse;
+  end else
+    DpiAware := StrToXPManifestDpiAware(Cfg.GetValue(Path+'General/XPManifest/DpiAware/Value', ''));
+
+  if Cfg.GetValue(Path+'Version/Value',0)<=9 then
+    ExecutionLevel := TXPManifestExecutionLevel(Cfg.GetValue(Path+'General/XPManifest/ExecutionLevel/Value', 0))
+  else
+    ExecutionLevel := StrToXPManifestExecutionLevel(Cfg.GetValue(Path+'General/XPManifest/ExecutionLevel/Value', ''));
+  UIAccess := Cfg.GetValue(Path+'General/XPManifest/UIAccess/Value', False);
 end;
 
 initialization

languages/lazaruside.af_ZA.po

@@ -2947,8 +2947,24 @@ msgstr ""
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.ar.po

@@ -2953,8 +2953,24 @@ msgstr ""
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.ca.po

@@ -3035,8 +3035,24 @@ msgstr ""
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.cs.po

@@ -2955,9 +2955,25 @@ msgstr "Vytvořit aplikační balík"
 msgid "Load &Default"
 msgstr "Načíst &defaultní"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Zapnuté zohlednění DPI (pro Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.de.po

@@ -2951,9 +2951,25 @@ msgstr "Anwendungsbundle erzeugen"
 msgid "Load &Default"
 msgstr "Vorgabe-Symbol laden"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "dpi-abhängige Anwendung (für Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.es.po

@@ -2976,9 +2976,25 @@ msgstr "Crear envoltorio de la aplicación"
 msgid "Load &Default"
 msgstr "Cargar Pre&determinado"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Activar DPI Awareness (para Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.fi.po

@@ -2919,9 +2919,25 @@ msgstr "Tee \"Application Bundle\""
 msgid "Load &Default"
 msgstr "Lataa &oletus"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Salli DPI:n käyttö (Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.fr.po

@@ -2952,9 +2952,25 @@ msgstr "Créer un ensemble application"
 msgid "Load &Default"
 msgstr "Icône par &défaut"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Activer \"DPI Awareness\" (pour Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.he.po

@@ -3106,11 +3106,25 @@ msgstr "צור חבילת יישום"
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-#, fuzzy
-#| msgid "Dpi aware application (for Vista+)"
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "יישום שמודע לצפיפות הנקודות (עבור ויסטה)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.hu.po

@@ -2949,9 +2949,25 @@ msgstr "Alkalmazásköteg létrehozása"
 msgid "Load &Default"
 msgstr "Alapértelmezés betöltése"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "DPI-tudatos megjelenés engedélyezése (Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.id.po

@@ -3045,8 +3045,24 @@ msgstr ""
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.it.po

@@ -2984,9 +2984,25 @@ msgstr "Crea un bundle di applicazioni"
 msgid "Load &Default"
 msgstr "Carica i pre&definiti"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "L'applicazione usa i Dpi (da Vista in poi)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.ja.po

@@ -2980,9 +2980,25 @@ msgstr "アプリケーションバンドルを作成"
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "DPI 認知を有効にする (Vista+ 向け)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.lt.po

@@ -3009,9 +3009,25 @@ msgstr "Sukurti programą-ryšulį"
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Įgalintas „DPI Awareness“ (dėl „Vista“ ir +)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.nl.po

@@ -3041,8 +3041,24 @@ msgstr ""
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.pl.po

@@ -3093,11 +3093,25 @@ msgstr "Utwórz Zestaw Aplikacji"
 msgid "Load &Default"
 msgstr "Wczytaj &domyślne"
 
-#: lazarusidestrconsts.dlgpodpiaware
-#, fuzzy
-#| msgid "Dpi aware application (for Vista+)"
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Aplikacja obsługuje większe DPI (dla Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.po

@@ -2936,8 +2936,24 @@ msgstr ""
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.pt_BR.po

@@ -2993,9 +2993,25 @@ msgstr "Criar Aplicação Encartada"
 msgid "Load &Default"
 msgstr "Carregar &Padrão"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Consciência de DPI habilitado (para Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.ru.po

@@ -5,7 +5,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-07-05 01:19+0300\n"
+"PO-Revision-Date: 2016-11-11 01:34+0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,3325,-1,-1\n"
@@ -2950,9 +2950,25 @@ msgstr "Создать Application Bundle"
 msgid "Load &Default"
 msgstr "Загрузить по &умолчанию"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Поддержка различных DPI (для Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr "Поддержка DPI"
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr "выключена"
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr "Vista-8: выключена, 8.1+: отдельно для каждого монитора"
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr "Vista-8: включена, 8.1+: отдельно для каждого монитора"
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr "включена"
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.sk.po

@@ -3060,8 +3060,24 @@ msgstr "Vytvoriť zväzok aplikácií"
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.tr.po

@@ -2958,8 +2958,24 @@ msgstr ""
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel

languages/lazaruside.uk.po

@@ -2952,9 +2952,25 @@ msgstr "Створити пакет застосунків"
 msgid "Load &Default"
 msgstr "Завантажити &типові"
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
-msgstr "Програма з DPI (для Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
+msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel
 msgid "Execution Level"

languages/lazaruside.zh_CN.po

@@ -3074,8 +3074,24 @@ msgstr "创建应用程序包"
 msgid "Load &Default"
 msgstr ""
 
-#: lazarusidestrconsts.dlgpodpiaware
-msgid "Enabled DPI Awareness (for Vista+)"
+#: lazarusidestrconsts.dlgpodpiawareness
+msgid "DPI awareness"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoff
+msgid "off"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldoffnewpermonitor
+msgid "Vista-8: off, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenessoldonnewpermonitor
+msgid "Vista-8: on, 8.1+: per monitor"
+msgstr ""
+
+#: lazarusidestrconsts.dlgpodpiawarenesson
+msgid "on"
 msgstr ""
 
 #: lazarusidestrconsts.dlgpoexecutionlevel