From 857380bf12e188e49163acc3a533850660c9c491 Mon Sep 17 00:00:00 2001
From: gbamber <gbamber@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 14 Dec 2016 09:56:33 +0000
Subject: [PATCH] Small glitch with po

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5482 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/json_packager/jsonpackage.lps    |  25 ++++++++----------
 applications/json_packager/jsonpackage.res    | Bin 142012 -> 142052 bytes
 .../json_packager/locale/jsoneditor.en.po     |   4 ++-
 .../json_packager/locale/jsoneditor.es.po     |   2 +-
 .../json_packager/locale/jsoneditor.po        |   2 +-
 applications/json_packager/umain.pas          |   6 ++---
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index acdbcedc2..f23482400 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -10,7 +10,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="3"/>
         <CursorPos X="15" Y="19"/>
-        <UsageCount Value="160"/>
+        <UsageCount Value="161"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -20,16 +20,16 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="313"/>
-        <CursorPos Y="498"/>
+        <TopLine Value="586"/>
+        <CursorPos X="30" Y="617"/>
         <ExtraEditorCount Value="1"/>
         <ExtraEditor1>
           <IsVisibleTab Value="True"/>
-          <TopLine Value="37"/>
-          <CursorPos X="80" Y="258"/>
+          <WindowIndex Value="1"/>
+          <TopLine Value="312"/>
+          <CursorPos Y="498"/>
         </ExtraEditor1>
-        <UsageCount Value="160"/>
+        <UsageCount Value="161"/>
         <Bookmarks Count="3">
           <Item0 Y="857" ID="1"/>
           <Item1 Y="803"/>
@@ -41,7 +41,7 @@
       <Unit2>
         <Filename Value="ugenericcollection.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="160"/>
+        <UsageCount Value="161"/>
       </Unit2>
       <Unit3>
         <Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/>
@@ -49,7 +49,7 @@
         <UnitName Value="LockIni"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="40" Y="9"/>
-        <UsageCount Value="78"/>
+        <UsageCount Value="79"/>
       </Unit3>
       <Unit4>
         <Filename Value="D:\Lazarusprojects\golfml\egacalculator\source\umainform.pas"/>
@@ -355,7 +355,7 @@
         <EditorIndex Value="2"/>
         <TopLine Value="992"/>
         <CursorPos Y="1012"/>
-        <UsageCount Value="28"/>
+        <UsageCount Value="29"/>
         <Loaded Value="True"/>
       </Unit45>
       <Unit46>
@@ -363,16 +363,13 @@
         <EditorIndex Value="1"/>
         <TopLine Value="88"/>
         <CursorPos X="26" Y="110"/>
-        <UsageCount Value="27"/>
+        <UsageCount Value="28"/>
         <Loaded Value="True"/>
       </Unit46>
     </Units>
     <OtherDefines Count="1">
       <Define0 Value="IGNOREPICTURE"/>
     </OtherDefines>
-    <General>
-      <ActiveWindowIndexAtStart Value="1"/>
-    </General>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="umain.pas"/>
diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res
index 754adc445b9d6082e5b73601858154a3e0542678..e403dc91f480bdc886ede5071a068855fbd9b53f 100644
GIT binary patch
delta 60
zcmV-C0K@;h)d=L(2(VBK0duoa3v4Ho^BfeD#4;e0z%m=N-ZJn30ra!cG<GMGVN4s7
SP%{U!Y+RE8f?l>>0ldr-tQma(

delta 62
zcmaEIm1ECUjtv3ajINslxpUMfhsMZF)-z_?%y0abk(q(v`{utUW$GZ2$y*{NHuuHM
RVq|1!)`;7#5y!aa3;@}V7Qz4k

diff --git a/applications/json_packager/locale/jsoneditor.en.po b/applications/json_packager/locale/jsoneditor.en.po
index 016085cfe..a78f8b124 100644
--- a/applications/json_packager/locale/jsoneditor.en.po
+++ b/applications/json_packager/locale/jsoneditor.en.po
@@ -365,7 +365,9 @@ msgid "- Update zip name missing extension \".zip\""
 msgstr "- Update zip name missing extension \".zip\""
 
 #: umain.rsuseincombina
-msgid "Use in combination with %s"
+#, fuzzy
+#| msgid "Use in combination with %s"
+msgid "Use in combination with"
 msgstr "Use in combination with %s"
 
 #: umain.rsversion
diff --git a/applications/json_packager/locale/jsoneditor.es.po b/applications/json_packager/locale/jsoneditor.es.po
index 4221fc0fc..3237c9f59 100644
--- a/applications/json_packager/locale/jsoneditor.es.po
+++ b/applications/json_packager/locale/jsoneditor.es.po
@@ -375,7 +375,7 @@ msgid "- Update zip name missing extension \".zip\""
 msgstr "- El nombre del zip no tiene la extensión \".zip\""
 
 #: umain.rsuseincombina
-msgid "Use in combination with %s"
+msgid "Use in combination with"
 msgstr ""
 
 #: umain.rsversion
diff --git a/applications/json_packager/locale/jsoneditor.po b/applications/json_packager/locale/jsoneditor.po
index cd673bad8..d3966389a 100644
--- a/applications/json_packager/locale/jsoneditor.po
+++ b/applications/json_packager/locale/jsoneditor.po
@@ -343,7 +343,7 @@ msgid "- Update zip name missing extension \".zip\""
 msgstr ""
 
 #: umain.rsuseincombina
-msgid "Use in combination with %s"
+msgid "Use in combination with"
 msgstr ""
 
 #: umain.rsversion
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index 4e499b435..2c56e7e4d 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -279,7 +279,7 @@ resourcestring
     '- Every .lpk entry must have a unique name.';
   rsUpdateJsonSF = 'Update file "%s" failed to load correctly.';
   rsNotifyUpdate = 'Notify Update';
-  rsUseInCombina = 'Use in combination with %s';
+  rsUseInCombina = 'Use in combination with';
   rsPackageDInfo = 'Package #%d Information';
   rsThePackageFi = 'The package filename (No path e.g. package.lpk)';
   rsVersion = 'Version: ';
@@ -599,7 +599,7 @@ begin
       OnMouseEnter := @CtrlShowPopup;
       OnMouseLeave := @CtrlHidePopup;
       OnClick := @CtrlHidePopup;
-      Hint := Format('%s%s%s%s', [rsInternalVers,LineEnding,rsUseInCombina,rsNotifyUpdate]);
+      Hint := Format('%s%s%s %s', [rsInternalVers,LineEnding,rsUseInCombina,rsNotifyUpdate]);
       Parent := ArrayGrpBox[iNumLpkFilesVisible];
     end;
     // SpinEdit Internal Version
@@ -614,7 +614,7 @@ begin
       OnMouseLeave := @CtrlHidePopup;
       OnClick := @CtrlHidePopup;
       OnChange := @CtrlMakeDirty;
-      Hint := Format('%s%s%s%s', [rsInternalVers,LineEnding,rsUseInCombina,rsNotifyUpdate]);
+      Hint := Format('%s%s%s %s', [rsInternalVers,LineEnding,rsUseInCombina,rsNotifyUpdate]);
       Parent := ArrayGrpBox[iNumLpkFilesVisible];
     end;
     // This sets the subcontrols up correctly