Changeset 145 for trunk

Timestamp:

Mar 24, 2024, 3:50:23 PM (8 months ago)

Author:

chronos

Message:

• Modified: Updated Common package.

Location:

trunk

Files:

• Engine.pas (modified) (1 diff)
• Forms/FormMain.pas (modified) (3 diffs)
• Forms/FormTest.lfm (deleted)
• Forms/FormTest.lrj (deleted)
• Forms/FormTest.pas (deleted)
• Forms/FormTestCase.lfm (deleted)
• Forms/FormTestCase.lrj (deleted)
• Forms/FormTestCase.pas (deleted)
• Languages/TransLines.cs.po (modified) (1 diff)
• Languages/TransLines.de.po (modified) (1 diff)
• Languages/TransLines.fr.po (modified) (1 diff)
• Languages/TransLines.pot (modified) (1 diff)
• Packages/Common/AboutDialog.pas (deleted)
• Packages/Common/Common.lpk (modified) (3 diffs)
• Packages/Common/Common.pas (modified) (3 diffs)
• Packages/Common/CommonPackage.pas (modified) (2 diffs)
• Packages/Common/DataFile.pas (modified) (1 diff)
• Packages/Common/FormAbout.lfm (deleted)
• Packages/Common/FormAbout.lrj (deleted)
• Packages/Common/FormAbout.pas (deleted)
• Packages/Common/FormEx.pas (added)
• Packages/Common/Forms (added)
• Packages/Common/Forms/FormAbout.lfm (added)
• Packages/Common/Forms/FormAbout.lrj (added)
• Packages/Common/Forms/FormAbout.pas (added)
• Packages/Common/Forms/FormTest.lfm (added)
• Packages/Common/Forms/FormTest.lrj (added)
• Packages/Common/Forms/FormTest.pas (added)
• Packages/Common/Forms/FormTests.lfm (added)
• Packages/Common/Forms/FormTests.lrj (added)
• Packages/Common/Forms/FormTests.pas (added)
• Packages/Common/Languages/DataFile.cs.po (modified) (2 diffs)
• Packages/Common/Languages/DebugLog.cs.po (modified) (2 diffs)
• Packages/Common/Languages/FindFile.cs.po (modified) (2 diffs)
• Packages/Common/Languages/FormAbout.cs.po (modified) (4 diffs)
• Packages/Common/Languages/FormTest.cs.po (added)
• Packages/Common/Languages/FormTest.pot (added)
• Packages/Common/Languages/FormTests.cs.po (added)
• Packages/Common/Languages/FormTests.pot (added)
• Packages/Common/Languages/JobProgressView.cs.po (modified) (6 diffs)
• Packages/Common/Languages/Languages.cs.po (modified) (67 diffs)
• Packages/Common/Languages/Pool.cs.po (modified) (3 diffs)
• Packages/Common/Languages/ResetableThread.cs.po (modified) (2 diffs)
• Packages/Common/Languages/ScaleDPI.cs.po (modified) (2 diffs)
• Packages/Common/Languages/Table.pot (added)
• Packages/Common/Languages/TestCase.cs.po (modified) (3 diffs)
• Packages/Common/Languages/Threading.cs.po (modified) (2 diffs)
• Packages/Common/Table.pas (added)
• Packages/Common/Translator.pas (modified) (5 diffs)
• TransLines.lpi (modified) (3 diffs)
• TransLines.lpr (modified) (1 diff)

trunk/Engine.pas

@@ -2136 +2136 @@
       Checked := FullScreen;
     end;
-      with AddComboBox(SVisualStyle, [], VisualStyleChanged) do begin
+    with AddComboBox(SVisualStyle, [], VisualStyleChanged) do begin
       TextSize := 40;
       TextColor := Colors.MenuItemText;

trunk/Forms/FormMain.pas

@@ -55 +55 @@
 
 uses
-  PixelPointer, Core, FormTest, TestCases;
+  PixelPointer, Core, FormTests, TestCases;
 
 { TFormMain }
@@ -128 +128 @@
 {$ENDIF}
 var
-  FormTest: TFormTest;
+  FormTest: TFormTests;
 begin
   if Key = KeyF11 then begin
@@ -135 +135 @@
 {$IFDEF DEBUG}
   if Key = KeyF12 then begin
-    FormTest := TFormTest.Create(nil);
+    FormTest := TFormTests.Create(nil);
     try
       FormTest.TestCases := InitTestCases;

trunk/Languages/TransLines.cs.po

@@ -349 +349 @@
 msgstr "TransLines"
 
-#: tformtest.arun.caption
-msgctxt "tformtest.arun.caption"
-msgid "Run"
-msgstr "Spustit"
-
-#: tformtest.ashow.caption
-msgid "Show"
-msgstr "Ukázat"
-
-#: tformtest.buttonrun.caption
-msgctxt "tformtest.buttonrun.caption"
-msgid "Run"
-msgstr "Spustit"
-
-#: tformtest.caption
-msgid "Test"
-msgstr "Test"
-
-#: tformtest.labelresult.caption
-msgid "   "
-msgstr "   "
-
-#: tformtest.listviewtestcases.columns[0].caption
-msgid "Name"
-msgstr "Jméno"
-
-#: tformtest.listviewtestcases.columns[1].caption
-msgid "Result"
-msgstr "Výsledek"
-
-#: tformtestcase.caption
-msgid "Test case"
-msgstr "Testový případ"
-
 #: track.salreadyconnectedtrackpoint
 msgctxt "track.salreadyconnectedtrackpoint"

trunk/Languages/TransLines.de.po

@@ -350 +350 @@
 msgstr "TransLines"
 
-#: tformtest.arun.caption
-msgctxt "tformtest.arun.caption"
-msgid "Run"
-msgstr ""
-
-#: tformtest.ashow.caption
-msgid "Show"
-msgstr ""
-
-#: tformtest.buttonrun.caption
-msgctxt "tformtest.buttonrun.caption"
-msgid "Run"
-msgstr ""
-
-#: tformtest.caption
-msgid "Test"
-msgstr ""
-
-#: tformtest.labelresult.caption
-msgid "   "
-msgstr ""
-
-#: tformtest.listviewtestcases.columns[0].caption
-msgid "Name"
-msgstr ""
-
-#: tformtest.listviewtestcases.columns[1].caption
-msgid "Result"
-msgstr ""
-
-#: tformtestcase.caption
-msgid "Test case"
-msgstr ""
-
 #: track.salreadyconnectedtrackpoint
 msgctxt "track.salreadyconnectedtrackpoint"

trunk/Languages/TransLines.fr.po

@@ -351 +351 @@
 msgstr "TransLines"
 
-#: tformtest.arun.caption
-msgctxt "tformtest.arun.caption"
-msgid "Run"
-msgstr "Exécuter"
-
-#: tformtest.ashow.caption
-msgid "Show"
-msgstr "Montrer"
-
-#: tformtest.buttonrun.caption
-msgctxt "tformtest.buttonrun.caption"
-msgid "Run"
-msgstr "Exécuter"
-
-#: tformtest.caption
-msgid "Test"
-msgstr "Test"
-
-#: tformtest.labelresult.caption
-msgid "   "
-msgstr "   "
-
-#: tformtest.listviewtestcases.columns[0].caption
-msgid "Name"
-msgstr "Nom"
-
-#: tformtest.listviewtestcases.columns[1].caption
-msgid "Result"
-msgstr "Résultat"
-
-#: tformtestcase.caption
-msgid "Test case"
-msgstr "Cas de test"
-
 #: track.salreadyconnectedtrackpoint
 msgctxt "track.salreadyconnectedtrackpoint"

trunk/Languages/TransLines.pot

@@ -339 +339 @@
 msgstr ""
 
-#: tformtest.arun.caption
-msgctxt "tformtest.arun.caption"
-msgid "Run"
-msgstr ""
-
-#: tformtest.ashow.caption
-msgid "Show"
-msgstr ""
-
-#: tformtest.buttonrun.caption
-msgctxt "tformtest.buttonrun.caption"
-msgid "Run"
-msgstr ""
-
-#: tformtest.caption
-msgid "Test"
-msgstr ""
-
-#: tformtest.labelresult.caption
-msgid "   "
-msgstr ""
-
-#: tformtest.listviewtestcases.columns[0].caption
-msgid "Name"
-msgstr ""
-
-#: tformtest.listviewtestcases.columns[1].caption
-msgid "Result"
-msgstr ""
-
-#: tformtestcase.caption
-msgid "Test case"
-msgstr ""
-
 #: track.salreadyconnectedtrackpoint
 msgctxt "track.salreadyconnectedtrackpoint"

trunk/Packages/Common/Common.lpk

@@ -11 +11 @@
       <PathDelim Value="\"/>
       <SearchPaths>
+        <OtherUnitFiles Value="Forms"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
@@ -41 +42 @@
 Source: https://svn.zdechov.net/PascalClassLibrary/Common/"/>
     <License Value="Copy left."/>
-    <Version Minor="11"/>
-    <Files Count="33">
+    <Version Minor="12"/>
+    <Files Count="36">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -159 +160 @@
       </Item26>
       <Item27>
-        <Filename Value="FormAbout.pas"/>
-        <UnitName Value="FormAbout"/>
+        <Filename Value="PixelPointer.pas"/>
+        <UnitName Value="PixelPointer"/>
       </Item27>
       <Item28>
-        <Filename Value="AboutDialog.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="AboutDialog"/>
+        <Filename Value="DataFile.pas"/>
+        <UnitName Value="DataFile"/>
       </Item28>
       <Item29>
-        <Filename Value="PixelPointer.pas"/>
-        <UnitName Value="PixelPointer"/>
+        <Filename Value="TestCase.pas"/>
+        <UnitName Value="TestCase"/>
       </Item29>
       <Item30>
-        <Filename Value="DataFile.pas"/>
-        <UnitName Value="DataFile"/>
+        <Filename Value="Generics.pas"/>
+        <UnitName Value="Generics"/>
       </Item30>
       <Item31>
-        <Filename Value="TestCase.pas"/>
-        <UnitName Value="TestCase"/>
-      </Item31>
-      <Item32>
-        <Filename Value="Generics.pas"/>
-        <UnitName Value="Generics"/>
-      </Item32>
-      <Item33>
         <Filename Value="CommonPackage.pas"/>
         <Type Value="Main Unit"/>
         <UnitName Value="CommonPackage"/>
+      </Item31>
+      <Item32>
+        <Filename Value="Table.pas"/>
+        <UnitName Value="Table"/>
+      </Item32>
+      <Item33>
+        <Filename Value="FormEx.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="FormEx"/>
       </Item33>
+      <Item34>
+        <Filename Value="Forms\FormTests.pas"/>
+        <UnitName Value="FormTests"/>
+      </Item34>
+      <Item35>
+        <Filename Value="Forms\FormTest.pas"/>
+        <UnitName Value="FormTest"/>
+      </Item35>
+      <Item36>
+        <Filename Value="Forms\FormAbout.pas"/>
+        <UnitName Value="FormAbout"/>
+      </Item36>
     </Files>
     <CompatibilityMode Value="True"/>

trunk/Packages/Common/Common.pas

@@ -65 +65 @@
 function GetFileFilterItemExt(Filter: string; Index: Integer): string;
 function IntToBin(Data: Int64; Count: Byte): string;
-function Implode(Separator: Char; List: TList<string>): string;
+function Implode(Separator: string; List: TList<string>): string;
+function Implode(Separator: string; List: TStringList; Around: string = ''): string;
 function LastPos(const SubStr: String; const S: String): Integer;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
@@ -206 +207 @@
 end;*)
 
+function Implode(Separator: string; List: TStringList; Around: string = ''): string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to List.Count - 1 do begin
+    Result := Result + Around + List[I] + Around;
+    if I < List.Count - 1 then Result := Result + Separator;
+  end;
+end;
+
 function LastPos(const SubStr: String; const S: String): Integer;
 begin
@@ -314 +326 @@
 end;
 
-function Implode(Separator: Char; List: TList<string>): string;
+function Implode(Separator: string; List: TList<string>): string;
 var
   I: Integer;

trunk/Packages/Common/CommonPackage.pas

@@ -9 +9 @@
 
 uses
-  StopWatch, Common, DebugLog, Common.Delay, PrefixMultiplier, URI, Threading,
+  StopWatch, Common, DebugLog, Common.Delay, PrefixMultiplier, URI, Threading, 
   Memory, ResetableThread, Pool, LastOpenedList, RegistryEx, JobProgressView, 
   XML, ApplicationInfo, SyncCounter, ListViewSort, PersistentForm, FindFile, 
   ScaleDPI, Theme, StringTable, MetaCanvas, Geometric, Translator, Languages, 
-  FormAbout, AboutDialog, PixelPointer, DataFile, TestCase, Generics, 
-  LazarusPackageIntf;
+  PixelPointer, DataFile, TestCase, Generics, Table, FormEx, FormTests, 
+  FormTest, FormAbout, LazarusPackageIntf;
 
 implementation
@@ -31 +31 @@
   RegisterUnit('Theme', @Theme.Register);
   RegisterUnit('Translator', @Translator.Register);
-  RegisterUnit('AboutDialog', @AboutDialog.Register);
+  RegisterUnit('FormEx', @FormEx.Register);
 end;
 

trunk/Packages/Common/DataFile.pas

@@ -77 +77 @@
 procedure TDataFile.Assign(Source: TPersistent);
 begin
-  inherited;
   if Source is TDataFile then begin
     FFileName := TDataFile(Source).FFileName;
     FModified := TDataFile(Source).FModified;
-  end;
+  end else inherited;
 end;
 

trunk/Packages/Common/Languages/DataFile.cs.po

@@ -13 +13 @@
 
 #: datafile.sallfiles
-#, fuzzy
 msgctxt "datafile.sallfiles"
 msgid "All files"
@@ -19 +18 @@
 
 #: datafile.sdatafilename
-#, fuzzy
 msgctxt "datafile.sdatafilename"
 msgid "Data file"
 msgstr "Datový soubor"
-

trunk/Packages/Common/Languages/DebugLog.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: debuglog.sfilenamenotdefined
-#, fuzzy
 msgctxt "debuglog.sfilenamenotdefined"
 msgid "Filename not defined"
 msgstr "Neurčen soubor"
-

trunk/Packages/Common/Languages/FindFile.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: \n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: findfile.sdirnotfound
-#, fuzzy
 msgctxt "findfile.sdirnotfound"
 msgid "Directory not found"
 msgstr "Adresář nenalezen"
-

trunk/Packages/Common/Languages/FormAbout.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: Chronos <robie@centrum.cz>\n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: formabout.slicense
-#, fuzzy
 msgctxt "formabout.slicense"
 msgid "License"
@@ -19 +18 @@
 
 #: formabout.sreleasedate
-#, fuzzy
 msgctxt "formabout.sreleasedate"
 msgid "Release date"
@@ -25 +23 @@
 
 #: formabout.sversion
-#, fuzzy
 msgctxt "formabout.sversion"
 msgid "Version"

trunk/Packages/Common/Languages/JobProgressView.cs.po

@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: jobprogressview.sestimatedtime
-#, object-pascal-format, fuzzy
+#, object-pascal-format
 msgctxt "jobprogressview.sestimatedtime"
 msgid "Estimated time: %s"
@@ -19 +19 @@
 
 #: jobprogressview.sexecuted
-#, fuzzy
 msgctxt "jobprogressview.sexecuted"
 msgid "Executed"
@@ -25 +24 @@
 
 #: jobprogressview.sfinished
-#, fuzzy
 msgctxt "jobprogressview.sfinished"
 msgid "Finished"
@@ -31 +29 @@
 
 #: jobprogressview.spleasewait
-#, fuzzy
 msgctxt "jobprogressview.spleasewait"
 msgid "Please wait..."
@@ -37 +34 @@
 
 #: jobprogressview.sterminate
-#, fuzzy
 msgctxt "jobprogressview.sterminate"
 msgid "Termination"
@@ -43 +39 @@
 
 #: jobprogressview.stotalestimatedtime
-#, object-pascal-format, fuzzy
+#, object-pascal-format
 msgctxt "jobprogressview.stotalestimatedtime"
 msgid "Total estimated time: %s"
 msgstr "Celkový odhadovaný čas: %s"
-

trunk/Packages/Common/Languages/Languages.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: Jiří Hajda <software@mezservis.cz>\n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: languages.slangauto
-#, fuzzy
 msgctxt "languages.slangauto"
 msgid "Automatic"
@@ -22 +23 @@
 
 #: languages.slang_ab
-#, fuzzy
 msgctxt "languages.slang_ab"
 msgid "Abkhazian"
@@ -33 +33 @@
 
 #: languages.slang_af
-#, fuzzy
 msgctxt "languages.slang_af"
 msgid "Afrikaans"
@@ -54 +53 @@
 
 #: languages.slang_ar
-#, fuzzy
 msgctxt "languages.slang_ar"
 msgid "Arabic"
@@ -90 +88 @@
 
 #: languages.slang_bg
-#, fuzzy
 msgctxt "languages.slang_bg"
 msgid "Bulgarian"
@@ -116 +113 @@
 
 #: languages.slang_bo
-#, fuzzy
 msgctxt "languages.slang_bo"
 msgid "Tibetan"
@@ -132 +128 @@
 
 #: languages.slang_ca
-#, fuzzy
 msgctxt "languages.slang_ca"
 msgid "Catalan"
@@ -153 +148 @@
 
 #: languages.slang_cr
-#, fuzzy
 msgctxt "languages.slang_cr"
 msgid "Cree"
@@ -159 +153 @@
 
 #: languages.slang_cs
-#, fuzzy
 msgctxt "languages.slang_cs"
 msgid "Czech"
@@ -175 +168 @@
 
 #: languages.slang_da
-#, fuzzy
 msgctxt "languages.slang_da"
 msgid "Danish"
@@ -181 +173 @@
 
 #: languages.slang_de
-#, fuzzy
 msgctxt "languages.slang_de"
 msgid "German"
@@ -187 +178 @@
 
 #: languages.slang_de_at
-#, fuzzy
 msgctxt "languages.slang_de_at"
 msgid "Austrian German"
@@ -193 +183 @@
 
 #: languages.slang_de_ch
-#, fuzzy
 msgctxt "languages.slang_de_ch"
 msgid "Swiss German"
@@ -214 +203 @@
 
 #: languages.slang_el
-#, fuzzy
 msgctxt "languages.slang_el"
 msgid "Greek"
@@ -220 +208 @@
 
 #: languages.slang_en
-#, fuzzy
 msgctxt "languages.slang_en"
 msgid "English"
@@ -226 +213 @@
 
 #: languages.slang_en_au
-#, fuzzy
 msgctxt "languages.slang_en_au"
 msgid "Australian English"
@@ -232 +218 @@
 
 #: languages.slang_en_ca
-#, fuzzy
 msgctxt "languages.slang_en_ca"
 msgid "Canadian English"
@@ -238 +223 @@
 
 #: languages.slang_en_gb
-#, fuzzy
 msgctxt "languages.slang_en_gb"
 msgid "British English"
@@ -244 +228 @@
 
 #: languages.slang_en_us
-#, fuzzy
 msgctxt "languages.slang_en_us"
 msgid "American English"
@@ -250 +233 @@
 
 #: languages.slang_eo
-#, fuzzy
 msgctxt "languages.slang_eo"
 msgid "Esperanto"
@@ -256 +238 @@
 
 #: languages.slang_es
-#, fuzzy
 msgctxt "languages.slang_es"
 msgid "Spanish"
@@ -262 +243 @@
 
 #: languages.slang_et
-#, fuzzy
 msgctxt "languages.slang_et"
 msgid "Estonian"
@@ -273 +253 @@
 
 #: languages.slang_fa
-#, fuzzy
 msgctxt "languages.slang_fa"
 msgid "Persian"
@@ -284 +263 @@
 
 #: languages.slang_fi
-#, fuzzy
 msgctxt "languages.slang_fi"
 msgid "Finnish"
@@ -300 +278 @@
 
 #: languages.slang_fr
-#, fuzzy
 msgctxt "languages.slang_fr"
 msgid "French"
@@ -316 +293 @@
 
 #: languages.slang_ga
-#, fuzzy
 msgctxt "languages.slang_ga"
 msgid "Irish"
@@ -352 +328 @@
 
 #: languages.slang_he
-#, fuzzy
 msgctxt "languages.slang_he"
 msgid "Hebrew"
@@ -368 +343 @@
 
 #: languages.slang_hr
-#, fuzzy
 msgctxt "languages.slang_hr"
 msgid "Croatian"
@@ -379 +353 @@
 
 #: languages.slang_hu
-#, fuzzy
 msgctxt "languages.slang_hu"
 msgid "Hungarian"
@@ -385 +358 @@
 
 #: languages.slang_hy
-#, fuzzy
 msgctxt "languages.slang_hy"
 msgid "Armenian"
@@ -431 +403 @@
 
 #: languages.slang_is
-#, fuzzy
 msgctxt "languages.slang_is"
 msgid "Icelandic"
@@ -437 +408 @@
 
 #: languages.slang_it
-#, fuzzy
 msgctxt "languages.slang_it"
 msgid "Italian"
@@ -448 +418 @@
 
 #: languages.slang_ja
-#, fuzzy
 msgctxt "languages.slang_ja"
 msgid "Japanese"
@@ -459 +428 @@
 
 #: languages.slang_ka
-#, fuzzy
 msgctxt "languages.slang_ka"
 msgid "Georgian"
@@ -465 +433 @@
 
 #: languages.slang_kg
-#, fuzzy
 msgctxt "languages.slang_kg"
 msgid "Kongo"
@@ -486 +453 @@
 
 #: languages.slang_kl
-#, fuzzy
 msgctxt "languages.slang_kl"
 msgid "Greenlandic"
@@ -497 +463 @@
 
 #: languages.slang_kn
-#, fuzzy
 msgctxt "languages.slang_kn"
 msgid "Kannada"
@@ -503 +468 @@
 
 #: languages.slang_ko
-#, fuzzy
 msgctxt "languages.slang_ko"
 msgid "Korean"
@@ -529 +493 @@
 
 #: languages.slang_kw
-#, fuzzy
 msgctxt "languages.slang_kw"
 msgid "Cornish"
@@ -540 +503 @@
 
 #: languages.slang_la
-#, fuzzy
 msgctxt "languages.slang_la"
 msgid "Latin"
@@ -546 +508 @@
 
 #: languages.slang_lb
-#, fuzzy
 msgctxt "languages.slang_lb"
 msgid "Luxembourgish"
@@ -567 +528 @@
 
 #: languages.slang_lo
-#, fuzzy
 msgctxt "languages.slang_lo"
 msgid "Lao"
@@ -573 +533 @@
 
 #: languages.slang_lt
-#, fuzzy
 msgctxt "languages.slang_lt"
 msgid "Lithuanian"
@@ -584 +543 @@
 
 #: languages.slang_lv
-#, fuzzy
 msgctxt "languages.slang_lv"
 msgid "Latvian"
@@ -605 +563 @@
 
 #: languages.slang_mk
-#, fuzzy
 msgctxt "languages.slang_mk"
 msgid "Macedonian"
@@ -616 +573 @@
 
 #: languages.slang_mn
-#, fuzzy
 msgctxt "languages.slang_mn"
 msgid "Mongolian"
@@ -622 +578 @@
 
 #: languages.slang_mo
-#, fuzzy
 msgctxt "languages.slang_mo"
 msgid "Moldavian"
@@ -673 +628 @@
 
 #: languages.slang_nl
-#, fuzzy
 msgctxt "languages.slang_nl"
 msgid "Dutch"
@@ -689 +643 @@
 
 #: languages.slang_no
-#, fuzzy
 msgctxt "languages.slang_no"
 msgid "Norwegian"
@@ -700 +653 @@
 
 #: languages.slang_nv
-#, fuzzy
 msgctxt "languages.slang_nv"
 msgid "Navajo"
@@ -746 +698 @@
 
 #: languages.slang_pl
-#, fuzzy
 msgctxt "languages.slang_pl"
 msgid "Polish"
@@ -757 +708 @@
 
 #: languages.slang_pt
-#, fuzzy
 msgctxt "languages.slang_pt"
 msgid "Portuguese"
@@ -763 +713 @@
 
 #: languages.slang_pt_br
-#, fuzzy
 msgctxt "languages.slang_pt_br"
 msgid "Brazilian Portuguese"
@@ -784 +733 @@
 
 #: languages.slang_ro
-#, fuzzy
 msgctxt "languages.slang_ro"
 msgid "Romanian"
@@ -790 +738 @@
 
 #: languages.slang_ru
-#, fuzzy
 msgctxt "languages.slang_ru"
 msgid "Russian"
@@ -831 +778 @@
 
 #: languages.slang_sk
-#, fuzzy
 msgctxt "languages.slang_sk"
 msgid "Slovak"
@@ -837 +783 @@
 
 #: languages.slang_sl
-#, fuzzy
 msgctxt "languages.slang_sl"
 msgid "Slovenian"
@@ -858 +803 @@
 
 #: languages.slang_sq
-#, fuzzy
 msgctxt "languages.slang_sq"
 msgid "Albanian"
@@ -879 +823 @@
 
 #: languages.slang_su
-#, fuzzy
 msgctxt "languages.slang_su"
 msgid "Sundanese"
@@ -885 +828 @@
 
 #: languages.slang_sv
-#, fuzzy
 msgctxt "languages.slang_sv"
 msgid "Swedish"
@@ -941 +883 @@
 
 #: languages.slang_tr
-#, fuzzy
 msgctxt "languages.slang_tr"
 msgid "Turkish"
@@ -952 +893 @@
 
 #: languages.slang_tt
-#, fuzzy
 msgctxt "languages.slang_tt"
 msgid "Tatar"
@@ -973 +913 @@
 
 #: languages.slang_uk
-#, fuzzy
 msgctxt "languages.slang_uk"
 msgid "Ukrainian"
@@ -994 +933 @@
 
 #: languages.slang_vi
-#, fuzzy
 msgctxt "languages.slang_vi"
 msgid "Vietnamese"
@@ -1035 +973 @@
 
 #: languages.slang_zh
-#, fuzzy
 msgctxt "languages.slang_zh"
 msgid "Chinese"
@@ -1041 +978 @@
 
 #: languages.slang_zu
-#, fuzzy
 msgctxt "languages.slang_zu"
 msgid "Zulu"
 msgstr "Zuluština"
-

trunk/Packages/Common/Languages/Pool.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: Chronos <robie@centrum.cz>\n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: pool.sobjectpoolempty
-#, fuzzy
 msgctxt "pool.sobjectpoolempty"
 msgid "Object pool is empty"
@@ -17 +18 @@
 
 #: pool.sreleaseerror
-#, fuzzy
 msgctxt "pool.sreleaseerror"
 msgid "Unknown object for release from pool"
 msgstr "Neznýmý objekt pro uvolnění ze zásobníku"
-

trunk/Packages/Common/Languages/ResetableThread.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: Chronos <robie@centrum.cz>\n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: resetablethread.swaiterror
-#, fuzzy
 msgctxt "resetablethread.swaiterror"
 msgid "WaitFor error"
 msgstr "Chyba WaitFor"
-

trunk/Packages/Common/Languages/ScaleDPI.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: \n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: scaledpi.swrongdpi
-#, object-pascal-format, fuzzy
+#, object-pascal-format
 msgctxt "scaledpi.swrongdpi"
 msgid "Wrong DPI [%d,%d]"

trunk/Packages/Common/Languages/TestCase.cs.po

@@ -13 +13 @@
 
 #: testcase.sfailed
-#, fuzzy
 msgctxt "testcase.sfailed"
 msgid "Failed"
@@ -19 +18 @@
 
 #: testcase.snone
-#, fuzzy
 msgctxt "testcase.snone"
 msgid "None"
@@ -25 +23 @@
 
 #: testcase.spassed
-#, fuzzy
 msgctxt "testcase.spassed"
 msgid "Passed"
 msgstr "Prošlo"
-

trunk/Packages/Common/Languages/Threading.cs.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
@@ -7 +6 @@
 "Last-Translator: Chronos <robie@centrum.cz>\n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: threading.scurrentthreadnotfound
-#, object-pascal-format, fuzzy
+#, object-pascal-format
 msgctxt "threading.scurrentthreadnotfound"
 msgid "Current thread ID %d not found in virtual thread list."
 msgstr "Aktuální vlákno ID %d nenalezeno v seznamu virtuálních vláken."
-

trunk/Packages/Common/Translator.pas

@@ -48 +48 @@
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
     function IsExcluded(Component: TPersistent; PropertyName: string): Boolean;
-    function GetLangFileDir: string;
+    function GetLangFileDirs: TStrings;
   public
     ComponentExcludes: TComponentExcludesList;
@@ -71 +71 @@
   end;
 
+const
+  PoExt = '.po';
+
 procedure Register;
 
 
 implementation
+
+uses
+  Common;
 
 procedure Register;
@@ -161 +167 @@
   FileList: TStringList;
   I: Integer;
+  J: Integer;
   LocaleShort: string;
   SearchMask: string;
+  LangDirs: TStrings;
 begin
   FPoFiles.Clear;
-  if Assigned(FLanguage) then
-  try
+  if Assigned(FLanguage) then begin
     LocaleShort := GetLocaleShort;
-    //ShowMessage(ExtractFileDir(Application.ExeName) +
-    //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
     SearchMask := '*';
     if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
-    SearchMask := SearchMask + '.po';
-    FileList := FindAllFiles(GetLangFileDir, SearchMask);
-    for I := 0 to FileList.Count - 1 do begin
-      FileName := FileList[I];
-      //FileName := FindLocaleFileName('.po');
-      if FileExists(FileName) and (
-      ((LocaleShort = '') and (Pos('.', FileName) = Pos('.po', FileName))) or
-      (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
-    end;
-  finally
-    FileList.Free;
+    SearchMask := SearchMask + PoExt;
+    LangDirs := GetLangFileDirs;
+    for J := 0 to LangDirs.Count - 1 do begin
+      FileList := FindAllFiles(LangDirs[J], SearchMask);
+      try
+        for I := 0 to FileList.Count - 1 do begin
+          FileName := FileList[I];
+          //FileName := FindLocaleFileName('.po');
+           if FileExists(FileName) and (
+          ((LocaleShort = '') and (Pos('.', FileName) = Pos(PoExt, FileName))) or
+          (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
+        end;
+      finally
+        FileList.Free;
+      end;
+    end;
+    LangDirs.Free;
   end;
 end;
@@ -299 +310 @@
 end;
 
-function TTranslator.GetLangFileDir: string;
-begin
-  Result := FPoFilesFolder;
-  if Copy(Result, 1, 1) <> DirectorySeparator then
-    Result := ExtractFileDir(Application.ExeName) +
-      DirectorySeparator + Result;
+function TTranslator.GetLangFileDirs: TStrings;
+var
+  I: Integer;
+begin
+  Result := TStringList.Create;
+  Result.Delimiter := ';';
+  Result.StrictDelimiter := True;
+  Result.DelimitedText := FPoFilesFolder;
+
+  for I := 0 to Result.Count - 1 do begin
+    Result[I] := StringReplace(Result[I], '/', DirectorySeparator, [rfReplaceAll]);
+    Result[I] := StringReplace(Result[I], '\', DirectorySeparator, [rfReplaceAll]);
+    if Copy(Result[I], 1, 1) <> DirectorySeparator then
+      Result[I] := ExtractFileDir(Application.ExeName) +
+        DirectorySeparator + Result[I];
+  end;
 end;
 
@@ -371 +392 @@
 var
   I: Integer;
-  LangDir: string;
-begin
-  LangDir := GetLangFileDir;
+  J: Integer;
+  LangDirs: TStrings;
+begin
+  LangDirs := GetLangFileDirs;
   Languages.SearchByCode('').Available := True; // Automatic
 
   for I := 1 to Languages.Count - 1 do
   with Languages[I] do begin
-    Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
-      '.' + Code + ExtensionSeparator + 'po') or (Code = 'en');
-  end;
+    for J := 0 to LangDirs.Count - 1 do begin
+      if FileExists(LangDirs[J] + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
+        '.' + Code + PoExt) or (Code = 'en') then begin
+          Available := True;
+          Continue;
+        end;
+    end;
+  end;
+  LangDirs.Free;
 end;
 

trunk/TransLines.lpi

@@ -89 +89 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="19">
+    <Units Count="17">
       <Unit0>
         <Filename Value="TransLines.lpr"/>
@@ -145 +145 @@
       </Unit11>
       <Unit12>
-        <Filename Value="Forms/FormTestCase.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormTestCase"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="Forms/FormTest.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormTest"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-      </Unit13>
-      <Unit14>
         <Filename Value="Core.pas"/>
         <IsPartOfProject Value="True"/>
@@ -164 +150 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="DataModule"/>
+      </Unit12>
+      <Unit13>
+        <Filename Value="TestCases.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit13>
+      <Unit14>
+        <Filename Value="Items.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit14>
       <Unit15>
-        <Filename Value="TestCases.pas"/>
+        <Filename Value="Scene.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit15>
       <Unit16>
-        <Filename Value="Items.pas"/>
+        <Filename Value="Scenes/SceneGameSlots.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit16>
-      <Unit17>
-        <Filename Value="Scene.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit17>
-      <Unit18>
-        <Filename Value="Scenes/SceneGameSlots.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit18>
     </Units>
   </ProjectOptions>

trunk/TransLines.lpr

@@ -8 +8 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, SysUtils, FormMain, FormImages, FormTestCase, FormTest, CommonPackage,
+  Forms, SysUtils, FormMain, FormImages, CommonPackage,
   Menu, BasicControls, MetroPassenger, Colors, View, River, City, Core,
   TestCases, Items, Scene, SceneGameSlots;