From 88b3257b591c3d7d72292d0ff6ca006ffd8018ac Mon Sep 17 00:00:00 2001
From: gbamber <gbamber@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 16 Dec 2016 12:09:09 +0000
Subject: [PATCH] Minor update

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5515 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/json_packager/jsonpackage.lpi    |   2 +-
 applications/json_packager/jsonpackage.lps    |  80 +++++++++---------
 applications/json_packager/jsonpackage.res    | Bin 143104 -> 143396 bytes
 .../json_packager/locale/jsoneditor.en.po     |   1 +
 .../json_packager/locale/jsoneditor.es.po     |   1 +
 applications/json_packager/umain.lfm          |   4 +-
 applications/json_packager/umain.pas          |  25 ++++--
 7 files changed, 62 insertions(+), 51 deletions(-)

diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi
index 179976d59..b8590d4a9 100644
--- a/applications/json_packager/jsonpackage.lpi
+++ b/applications/json_packager/jsonpackage.lpi
@@ -28,7 +28,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="2"/>
-      <RevisionNr Value="7"/>
+      <RevisionNr Value="8"/>
       <StringTable Comments="Buld configured for Win Linux and Darwin" FileDescription="An editor for OnlinePackageManager update JSON files" InternalName="jsoneditor" LegalCopyright="(c)2016 usernames lainz and minesadorada @ forum.lazarus.freepascal.org" LegalTrademarks="GPL code" OriginalFilename="jsoneditor" ProductName="Lazarus and Freepascal" ProductVersion="1.x and 3.x"/>
     </VersionInfo>
     <BuildModes Count="6">
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index 7bd48eac8..535662263 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="10"/>
-    <BuildModes Active="Win32"/>
+    <BuildModes Active="Win64"/>
     <Units Count="53">
       <Unit0>
         <Filename Value="jsonpackage.lpr"/>
@@ -20,8 +20,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="278"/>
-        <CursorPos X="18" Y="287"/>
+        <TopLine Value="1050"/>
+        <CursorPos X="37" Y="1068"/>
         <ExtraEditorCount Value="1"/>
         <ExtraEditor1>
           <EditorIndex Value="-1"/>
@@ -31,9 +31,9 @@
         </ExtraEditor1>
         <UsageCount Value="184"/>
         <Bookmarks Count="3">
-          <Item0 Y="903" ID="1"/>
-          <Item1 Y="668" ID="2"/>
-          <Item2 Y="138"/>
+          <Item0 Y="904" ID="1"/>
+          <Item1 Y="669" ID="2"/>
+          <Item2 Y="139"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -336,7 +336,7 @@
         <EditorIndex Value="2"/>
         <TopLine Value="19"/>
         <CursorPos X="23" Y="25"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit42>
       <Unit43>
@@ -365,7 +365,7 @@
         <EditorIndex Value="4"/>
         <TopLine Value="88"/>
         <CursorPos X="26" Y="110"/>
-        <UsageCount Value="38"/>
+        <UsageCount Value="39"/>
         <Loaded Value="True"/>
       </Unit46>
       <Unit47>
@@ -387,7 +387,7 @@
         <EditorIndex Value="3"/>
         <TopLine Value="83"/>
         <CursorPos X="10" Y="105"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit49>
       <Unit50>
@@ -396,7 +396,7 @@
         <EditorIndex Value="6"/>
         <TopLine Value="1517"/>
         <CursorPos X="23" Y="1549"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit50>
       <Unit51>
@@ -422,123 +422,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="umain.pas"/>
-        <Caret Line="1404" Column="23" TopLine="1398"/>
+        <Caret Line="139" Column="57" TopLine="116"/>
       </Position1>
       <Position2>
         <Filename Value="umain.pas"/>
-        <Caret Line="167" Column="31" TopLine="143"/>
+        <Caret Line="311" Column="33" TopLine="289"/>
       </Position2>
       <Position3>
         <Filename Value="umain.pas"/>
-        <Caret Line="139" Column="57" TopLine="116"/>
+        <Caret Line="137" Column="3" TopLine="115"/>
       </Position3>
       <Position4>
         <Filename Value="umain.pas"/>
-        <Caret Line="311" Column="33" TopLine="289"/>
+        <Caret Line="315" Column="38" TopLine="281"/>
       </Position4>
       <Position5>
         <Filename Value="umain.pas"/>
-        <Caret Line="137" Column="3" TopLine="115"/>
+        <Caret Line="140" Column="3" TopLine="126"/>
       </Position5>
       <Position6>
         <Filename Value="umain.pas"/>
-        <Caret Line="315" Column="38" TopLine="281"/>
+        <Caret Line="137" Column="47" TopLine="117"/>
       </Position6>
       <Position7>
         <Filename Value="umain.pas"/>
-        <Caret Line="140" Column="3" TopLine="126"/>
+        <Caret Line="138" TopLine="111"/>
       </Position7>
       <Position8>
         <Filename Value="umain.pas"/>
-        <Caret Line="137" Column="47" TopLine="117"/>
+        <Caret Line="137" Column="46" TopLine="127"/>
       </Position8>
       <Position9>
         <Filename Value="umain.pas"/>
-        <Caret Line="138" TopLine="111"/>
+        <Caret Line="159" Column="17" TopLine="144"/>
       </Position9>
       <Position10>
         <Filename Value="umain.pas"/>
-        <Caret Line="137" Column="46" TopLine="127"/>
+        <Caret Line="140" Column="50" TopLine="132"/>
       </Position10>
       <Position11>
         <Filename Value="umain.pas"/>
-        <Caret Line="159" Column="17" TopLine="144"/>
+        <Caret Line="812" Column="20" TopLine="804"/>
       </Position11>
       <Position12>
         <Filename Value="umain.pas"/>
-        <Caret Line="140" Column="50" TopLine="132"/>
+        <Caret Line="1230" Column="14" TopLine="1224"/>
       </Position12>
       <Position13>
         <Filename Value="umain.pas"/>
-        <Caret Line="812" Column="20" TopLine="804"/>
+        <Caret Line="858" Column="16" TopLine="829"/>
       </Position13>
       <Position14>
         <Filename Value="umain.pas"/>
-        <Caret Line="1230" Column="14" TopLine="1224"/>
+        <Caret Line="1247" Column="22" TopLine="1230"/>
       </Position14>
       <Position15>
         <Filename Value="umain.pas"/>
-        <Caret Line="858" Column="16" TopLine="829"/>
+        <Caret Line="772" Column="21" TopLine="758"/>
       </Position15>
       <Position16>
         <Filename Value="umain.pas"/>
-        <Caret Line="1247" Column="22" TopLine="1230"/>
+        <Caret Line="1039" Column="19" TopLine="1035"/>
       </Position16>
       <Position17>
         <Filename Value="umain.pas"/>
-        <Caret Line="772" Column="21" TopLine="758"/>
+        <Caret Line="1239" Column="7" TopLine="1218"/>
       </Position17>
       <Position18>
         <Filename Value="umain.pas"/>
-        <Caret Line="1039" Column="19" TopLine="1035"/>
+        <Caret Line="1236" Column="58" TopLine="1218"/>
       </Position18>
       <Position19>
         <Filename Value="umain.pas"/>
-        <Caret Line="1239" Column="7" TopLine="1218"/>
+        <Caret Line="1227" Column="21" TopLine="1218"/>
       </Position19>
       <Position20>
         <Filename Value="umain.pas"/>
-        <Caret Line="1236" Column="58" TopLine="1218"/>
+        <Caret Line="1038" Column="37" TopLine="1035"/>
       </Position20>
       <Position21>
         <Filename Value="umain.pas"/>
-        <Caret Line="1227" Column="21" TopLine="1218"/>
+        <Caret Line="1246" Column="12" TopLine="1212"/>
       </Position21>
       <Position22>
         <Filename Value="umain.pas"/>
-        <Caret Line="1038" Column="37" TopLine="1035"/>
+        <Caret Line="1039" TopLine="1035"/>
       </Position22>
       <Position23>
         <Filename Value="umain.pas"/>
-        <Caret Line="1246" Column="12" TopLine="1212"/>
+        <Caret Line="1241" Column="42" TopLine="1230"/>
       </Position23>
       <Position24>
         <Filename Value="umain.pas"/>
-        <Caret Line="1039" TopLine="1035"/>
+        <Caret Line="853" TopLine="814"/>
       </Position24>
       <Position25>
         <Filename Value="umain.pas"/>
-        <Caret Line="1241" Column="42" TopLine="1230"/>
+        <Caret Line="69" Column="13" TopLine="43"/>
       </Position25>
       <Position26>
         <Filename Value="umain.pas"/>
-        <Caret Line="853" TopLine="814"/>
+        <Caret Line="779" Column="27" TopLine="758"/>
       </Position26>
       <Position27>
         <Filename Value="umain.pas"/>
-        <Caret Line="69" Column="13" TopLine="43"/>
+        <Caret Line="857" Column="5" TopLine="835"/>
       </Position27>
       <Position28>
         <Filename Value="umain.pas"/>
-        <Caret Line="779" Column="27" TopLine="758"/>
+        <Caret Line="868" Column="40" TopLine="856"/>
       </Position28>
       <Position29>
         <Filename Value="umain.pas"/>
-        <Caret Line="857" Column="5" TopLine="835"/>
+        <Caret Line="278" Column="24" TopLine="268"/>
       </Position29>
       <Position30>
         <Filename Value="umain.pas"/>
-        <Caret Line="868" Column="40" TopLine="856"/>
+        <Caret Line="1095" TopLine="1062"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res
index d722e395cc61623f83fd1fc46f30b22e8731f71e..5861b3b30917618486f3f5a35c1a2250cf1eed5a 100644
GIT binary patch
delta 224
zcmZp;$FbxA$A)KYj2xSvvn^z1w3yt<b)0d{=0I*2iOC%P9g}DKJ8r(Id`*b)=jM%O
z&n4<za}*Mbk~1>P@)cr~REuMj6bedHQ&JU*Q;QT5OH1-~lM{>56I1dP3W^SIuE@+y
zR47ZWQYb7<RmjZCOwLSIEmkcK&o9kMQ2=Sm1d_$6i3*9yC7ET3MGC3KCHeNM#R?h$
zU_+A=bCWU?i;7bfQu7p2b5e6t74k~*K{|6&^A7J)aI7p%NmS4WY5*EjP<nV}vF7F(
R{%eGqos+gZCo%3l0|2lvRcrtN

delta 64
zcmV-G0KfmF;0S=;2(ab`0SB|^2B8B1H<O79#{nm^Q42&Ele<tvvtA_D5&{5PlTiyJ
WvsgF87_+-jtP+E0W4CBy0ldr}gBbGw

diff --git a/applications/json_packager/locale/jsoneditor.en.po b/applications/json_packager/locale/jsoneditor.en.po
index 73419b8c9..48105eca1 100644
--- a/applications/json_packager/locale/jsoneditor.en.po
+++ b/applications/json_packager/locale/jsoneditor.en.po
@@ -391,3 +391,4 @@ msgstr "Would you like to copy %s to the %s folder?"
 #: umain.rsyoumayneedto
 msgid "(You may need to restart the app to see the change)"
 msgstr "(You may need to restart the app to see the change)"
+
diff --git a/applications/json_packager/locale/jsoneditor.es.po b/applications/json_packager/locale/jsoneditor.es.po
index 613e175d4..6777319b0 100644
--- a/applications/json_packager/locale/jsoneditor.es.po
+++ b/applications/json_packager/locale/jsoneditor.es.po
@@ -384,3 +384,4 @@ msgstr "¿Quieres copiar %s a la carpeta %s?"
 #: umain.rsyoumayneedto
 msgid "(You may need to restart the app to see the change)"
 msgstr "(Quizás necesites reiniciar la aplicación para ver los cambios)"
+
diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm
index 5a28196c7..4135ef598 100644
--- a/applications/json_packager/umain.lfm
+++ b/applications/json_packager/umain.lfm
@@ -1,7 +1,7 @@
 object frmMain: TfrmMain
-  Left = 5
+  Left = 537
   Height = 398
-  Top = 444
+  Top = 192
   Width = 618
   Anchors = []
   BorderIcons = [biSystemMenu]
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index 12a552bb9..df64b0c18 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -66,7 +66,8 @@ unit umain;
   0.2.5.0:  BugFix: regression error: CreateUniqueINIFile (minesadorada)
   0.2.6.0:  Added feature: Help menu/AutoLoad Last File (minesadorada)
   0.2.7.0:  Updated: Save procedure (minesadorada)
-  0.2.8.0:  ??
+  0.2.8.0:  BugFix: ValidationFailed repeated messages about FoundDuplicates
+  0.2.9.0:  ??
  }
 {$mode objfpc}{$H+}
 
@@ -1066,7 +1067,11 @@ begin
   SetDefaultLang('en', 'locale', True);
   if Length(GetDefaultLang) > 0 then
   begin
-    ShowMessageFmt(rsLanguageChan, [GetDefaultLang]);
+    if bIsVirgin then
+       ShowMessageFmt(rsLanguageChan + '%s' + rsYouMayNeedTo, [GetDefaultLang,LineEnding])
+    else
+       ShowMessageFmt(rsLanguageChan, [GetDefaultLang]);
+
     CFG.WriteString('Options', 'Language', GetDefaultLang);
     mnu_lang_en.Checked := True;
   end
@@ -1083,7 +1088,10 @@ begin
   SetDefaultLang('es', 'locale', True);
   if Length(GetDefaultLang) > 0 then
   begin
-    ShowMessageFmt(rsLanguageChan, [GetDefaultLang]);
+    if bIsVirgin then
+       ShowMessageFmt(rsLanguageChan + '%s' + rsYouMayNeedTo, [GetDefaultLang,LineEnding])
+    else
+       ShowMessageFmt(rsLanguageChan, [GetDefaultLang]);
     CFG.WriteString('Options', 'Language', GetDefaultLang);
     mnu_lang_es.Checked := True;
   end
@@ -1188,11 +1196,12 @@ begin
       end;
     // Check for duplicate .lpk entries
     if FoundADuplicateLPK then
-    begin
-      ArrayEdtPackageFileName[iCount].Color := clYellow;
-      slErrorList.Add(Format(rsThereAreOneO, [LineEnding]));
-      Result := True;
-    end;
+       if slErrorList.IndexOf(Format(rsThereAreOneO, [LineEnding])) = -1 then
+       begin
+            ArrayEdtPackageFileName[iCount].Color := clYellow;
+            slErrorList.Add(Format(rsThereAreOneO, [LineEnding]));
+            Result := True;
+       end;
   end;
 end;