Changeset 45 for trunk

Timestamp:

Jul 15, 2016, 12:38:46 AM (8 years ago)

Author:

chronos

Message:

• Modified: More translated strings.

Location:

trunk

Files:

• Forms/UFormAcronyms.lfm (modified) (2 diffs)
• Forms/UFormAcronyms.lrt (modified) (1 diff)
• Forms/UFormAcronyms.pas (modified) (2 diffs)
• Forms/UFormImportPattern.lfm (modified) (9 diffs)
• Forms/UFormImportPattern.pas (modified) (4 diffs)
• Forms/UFormMain.lfm (modified) (4 diffs)
• Forms/UFormMain.pas (modified) (2 diffs)
• Languages/AcronymDecoder.cs.po (modified) (20 diffs)
• Languages/AcronymDecoder.po (modified) (5 diffs)
• UAcronym.pas (modified) (2 diffs)

trunk/Forms/UFormAcronyms.lfm

@@ -8 +8 @@
   ClientWidth = 740
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.7'
   object ListViewAcronyms: TListView
     Left = 8
@@ -21 +21 @@
       end    
       item
-        Caption = 'Description'
+        Caption = 'Meaning'
         Width = 300
       end    

trunk/Forms/UFormAcronyms.lrt

@@ -1 +1 @@
 TFORMACRONYMS.CAPTION=Acronyms
 TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[0].CAPTION=Name
-TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[1].CAPTION=Description
+TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[1].CAPTION=Meaning
 TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[2].CAPTION=Categories
 TFORMACRONYMS.AADD.CAPTION=Add

trunk/Forms/UFormAcronyms.pas

@@ -62 +62 @@
   SRemoveAcronym = 'Remove acronym';
   SRemoveAcronymQuery = 'Do you want to remove selected acronym?';
+  STotal = 'Total';
+  SFiltered = 'Filtered';
 
 
@@ -248 +250 @@
   ListViewSort1.Refresh;
   UpdateInterface;
-  StatusBar1.Panels[0].Text := 'Total: ' + IntToStr(MeaningCount);
-  StatusBar1.Panels[1].Text := 'Filtered: ' + IntToStr(ListViewAcronyms.Items.Count);
+  StatusBar1.Panels[0].Text := STotal + ': ' + IntToStr(MeaningCount);
+  StatusBar1.Panels[1].Text := SFiltered + ': ' + IntToStr(ListViewAcronyms.Items.Count);
 end;
 

trunk/Forms/UFormImportPattern.lfm

@@ -9 +9 @@
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.7'
   object Label8: TLabel
     Left = 24
-    Height = 20
+    Height = 24
     Top = 13
-    Width = 75
+    Width = 101
     Caption = 'Start string:'
     ParentColor = False
@@ -20 +20 @@
   object Label9: TLabel
     Left = 24
-    Height = 20
+    Height = 24
     Top = 53
-    Width = 69
+    Width = 92
     Caption = 'End string:'
     ParentColor = False
@@ -28 +28 @@
   object EditBlockEnd: TEdit
     Left = 183
-    Height = 28
+    Height = 34
     Top = 48
     Width = 461
@@ -36 +36 @@
   object EditBlockStart: TEdit
     Left = 183
-    Height = 28
+    Height = 34
     Top = 8
     Width = 461
@@ -64 +64 @@
   object Label10: TLabel
     Left = 24
-    Height = 20
+    Height = 24
     Top = 88
-    Width = 46
+    Width = 60
     Caption = 'Action:'
     ParentColor = False
@@ -72 +72 @@
   object Label11: TLabel
     Left = 24
-    Height = 20
+    Height = 24
     Top = 120
-    Width = 58
+    Width = 74
     Caption = 'Variable:'
     ParentColor = False
@@ -80 +80 @@
   object ComboBoxAction: TComboBox
     Left = 183
-    Height = 28
+    Height = 38
     Top = 87
     Width = 461
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 20
+    ItemHeight = 0
     Style = csDropDownList
     TabOrder = 4
@@ -90 +90 @@
   object ComboBoxVariable: TComboBox
     Left = 183
-    Height = 28
+    Height = 38
     Top = 120
     Width = 461
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 20
+    ItemHeight = 0
     Items.Strings = (
       ''
@@ -103 +103 @@
   object CheckBoxRepetition: TCheckBox
     Left = 24
-    Height = 24
+    Height = 28
     Top = 160
-    Width = 93
+    Width = 112
     Caption = 'Repetition'
     TabOrder = 6

trunk/Forms/UFormImportPattern.pas

@@ -45 +45 @@
 procedure TFormImportPattern.FormShow(Sender: TObject);
 begin
+  InitControls;
 end;
 
@@ -56 +57 @@
   I: TImportPatternFlag;
   J: TImportVariable;
+  Index: Integer;
 begin
+  Index := ComboBoxAction.ItemIndex;
   while ComboBoxAction.Items.Count > 0 do
     ComboBoxAction.Items.Delete(ComboBoxAction.Items.Count - 1);
@@ -63 +66 @@
   for I := Low(TImportPatternFlag) to High(TImportPatternFlag) do
     ComboBoxAction.Items[Integer(I)] := ImportPatternFlagString[I];
+  ComboBoxAction.ItemIndex := Index;
 
+  Index := ComboBoxVariable.ItemIndex;
   ComboBoxVariable.Items.Clear;
   while ComboBoxVariable.Items.Count > 0 do
@@ -71 +76 @@
   for J := Low(TImportVariable) to High(TImportVariable) do
     ComboBoxVariable.Items[Integer(J)] := ImportVariableString[J];
+  ComboBoxVariable.ItemIndex := Index;
 end;
 

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 631
   Caption = 'Acronym Decoder'
-  ClientHeight = 421
+  ClientHeight = 414
   ClientWidth = 631
   Menu = MainMenu1
@@ -13 +13 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.7'
   object Panel1: TPanel
     Left = 0
-    Height = 395
+    Height = 388
     Top = 26
     Width = 631
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 395
+    ClientHeight = 388
     ClientWidth = 631
     TabOrder = 0
     object CheckBoxExactMath: TCheckBox
       Left = 8
-      Height = 24
+      Height = 28
       Top = 3
-      Width = 104
+      Width = 129
       Caption = 'Exact match'
       OnChange = CheckBoxExactMathChange
@@ -43 +43 @@
     object ListViewAcronyms: TListView
       Left = 8
-      Height = 323
+      Height = 316
       Top = 64
       Width = 616
@@ -1398 +1398 @@
   object CoolTranslator1: TCoolTranslator
     POFilesFolder = 'Languages'
+    OnTranslate = CoolTranslator1Translate
     left = 264
     top = 176

trunk/Forms/UFormMain.pas

@@ -99 +99 @@
     procedure AShowImportSourcesExecute(Sender: TObject);
     procedure CheckBoxExactMathChange(Sender: TObject);
+    procedure CoolTranslator1Translate(Sender: TObject);
     procedure EditSearchChange(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -345 +346 @@
 end;
 
+procedure TFormMain.CoolTranslator1Translate(Sender: TObject);
+begin
+  UAcronym.Translate;
+end;
+
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin

trunk/Languages/AcronymDecoder.cs.po

@@ -62 +62 @@
 
 #: tformacronym.caption
+msgctxt "tformacronym.caption"
 msgid "Acronym"
 msgstr "Zkratka"
@@ -108 +109 @@
 
 #: tformacronyms.listviewacronyms.columns[0].caption
-#, fuzzy
-#| msgid "Id"
 msgctxt "tformacronyms.listviewacronyms.columns[0].caption"
 msgid "Name"
@@ -115 +114 @@
 
 #: tformacronyms.listviewacronyms.columns[1].caption
-#, fuzzy
-#| msgid "Name"
 msgctxt "tformacronyms.listviewacronyms.columns[1].caption"
-msgid "Description"
-msgstr "Popis"
+msgid "Meaning"
+msgstr "Význam"
 
 #: tformacronyms.listviewacronyms.columns[2].caption
-#, fuzzy
-#| msgid "Description"
 msgctxt "tformacronyms.listviewacronyms.columns[2].caption"
 msgid "Categories"
@@ -194 +189 @@
 
 #: tformimportformat.aadd.caption
-#, fuzzy
 msgctxt "tformimportformat.aadd.caption"
 msgid "Add"
@@ -200 +194 @@
 
 #: tformimportformat.amodify.caption
-#, fuzzy
 msgctxt "tformimportformat.amodify.caption"
 msgid "Modify"
@@ -214 +207 @@
 
 #: tformimportformat.aremove.caption
-#, fuzzy
 msgctxt "tformimportformat.aremove.caption"
 msgid "Remove"
@@ -239 +231 @@
 
 #: tformimportformat.label2.caption
-#, fuzzy
-#| msgid "Acronym start:"
 msgid "Item rules:"
-msgstr "Začátek zkratky:"
+msgstr "Pravidla položky:"
 
 #: tformimportformat.label3.caption
@@ -303 +293 @@
 
 #: tformimportpattern.buttoncancel.caption
-#, fuzzy
 msgctxt "tformimportpattern.buttoncancel.caption"
 msgid "Cancel"
@@ -309 +298 @@
 
 #: tformimportpattern.buttonok.caption
-#, fuzzy
 msgctxt "tformimportpattern.buttonok.caption"
 msgid "Ok"
@@ -340 +328 @@
 
 #: tformimportsource.acategoryadd.caption
-#, fuzzy
 msgctxt "tformimportsource.acategoryadd.caption"
 msgid "Add"
@@ -346 +333 @@
 
 #: tformimportsource.acategoryremove.caption
-#, fuzzy
 msgctxt "tformimportsource.acategoryremove.caption"
 msgid "Remove"
@@ -389 +375 @@
 
 #: tformimportsource.label4.caption
-#, fuzzy
 msgctxt "tformimportsource.label4.caption"
 msgid "Categories:"
@@ -433 +418 @@
 
 #: tformimportsources.listview1.columns[3].caption
-#, fuzzy
 msgctxt "tformimportsources.listview1.columns[3].caption"
 msgid "Categories"
@@ -542 +526 @@
 
 #: tformmain.menuitem24.caption
-#, fuzzy
 msgctxt "tformmain.menuitem24.caption"
 msgid "-"
@@ -594 +577 @@
 msgstr "Jazyk:"
 
+#: uacronym.sacronym
+msgctxt "uacronym.sacronym"
+msgid "Acronym"
+msgstr "Zkratka"
+
+#: uacronym.sdescription
+msgctxt "uacronym.sdescription"
+msgid "Description"
+msgstr "Popis"
+
+#: uacronym.smeaning
+msgctxt "uacronym.smeaning"
+msgid "Meaning"
+msgstr "Význam"
+
+#: uacronym.snewitem
+msgid "New item"
+msgstr "Nová položka"
+
+#: uacronym.snone
+msgid "None"
+msgstr "Žádný"
+
+#: uacronym.sskip
+msgid "Skip"
+msgstr "Přeskočit"
+
 #: uacronym.swrongfileformat
 msgid "Wrong file format"
@@ -625 +635 @@
 msgstr "Opravdu chcete odebrat vybrané kategorie?"
 
+#: uformacronyms.sfiltered
+msgid "Filtered"
+msgstr "Filtrováno"
+
 #: uformacronyms.sremoveacronym
 msgctxt "uformacronyms.sremoveacronym"
@@ -635 +649 @@
 msgstr "Chcete odebrat vybranou zkratku?"
 
+#: uformacronyms.stotal
+msgid "Total"
+msgstr "Celkem"
+
 #: uformcategories.scategory
 msgctxt "uformcategories.scategory"
@@ -659 +677 @@
 
 #: uformcategoryselect.scategory
-#, fuzzy
 msgctxt "uformcategoryselect.scategory"
 msgid "Category"
@@ -665 +682 @@
 
 #: uformcategoryselect.sremovecategory
-#, fuzzy
 msgctxt "uformcategoryselect.sremovecategory"
 msgid "Remove categories"
@@ -671 +687 @@
 
 #: uformcategoryselect.sremovecategoryquery
-#, fuzzy
 msgctxt "uformcategoryselect.sremovecategoryquery"
 msgid "Do you really want to remove selected categories?"
-msgstr "Opravdu chcete odebrat vybrabé kategorie?"
+msgstr "Opravdu chcete odebrat vybrané kategorie?"
 
 #: uformimport.simportednewacronyms

trunk/Languages/AcronymDecoder.po

@@ -52 +52 @@
 
 #: tformacronym.caption
+msgctxt "tformacronym.caption"
 msgid "Acronym"
 msgstr ""
@@ -104 +105 @@
 #: tformacronyms.listviewacronyms.columns[1].caption
 msgctxt "TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[1].CAPTION"
-msgid "Description"
+msgid "Meaning"
 msgstr ""
 
@@ -566 +567 @@
 msgstr ""
 
+#: uacronym.sacronym
+msgctxt "uacronym.sacronym"
+msgid "Acronym"
+msgstr ""
+
+#: uacronym.sdescription
+msgctxt "uacronym.sdescription"
+msgid "Description"
+msgstr ""
+
+#: uacronym.smeaning
+msgctxt "uacronym.smeaning"
+msgid "Meaning"
+msgstr ""
+
+#: uacronym.snewitem
+msgid "New item"
+msgstr ""
+
+#: uacronym.snone
+msgid "None"
+msgstr ""
+
+#: uacronym.sskip
+msgid "Skip"
+msgstr ""
+
 #: uacronym.swrongfileformat
 msgid "Wrong file format"
@@ -597 +625 @@
 msgstr ""
 
+#: uformacronyms.sfiltered
+msgid "Filtered"
+msgstr ""
+
 #: uformacronyms.sremoveacronym
 msgctxt "uformacronyms.sremoveacronym"
@@ -607 +639 @@
 msgstr ""
 
+#: uformacronyms.stotal
+msgid "Total"
+msgstr ""
+
 #: uformcategories.scategory
 msgctxt "uformcategories.scategory"

trunk/UAcronym.pas

@@ -225 +225 @@
 function AcronymComparer(Item1, Item2: Pointer): Integer;
 
-const
-  ImportVariableString: array [TImportVariable] of string = ('None', 'Acronym',
-    'Meaning', 'Description');
-  ImportPatternFlagString: array [TImportPatternFlag] of string = ('None', 'New item',
-    'Skip');
-
+var
+  ImportVariableString: array [TImportVariable] of string;
+  ImportPatternFlagString: array [TImportPatternFlag] of string;
+
+procedure Translate;
 
 implementation
@@ -236 +235 @@
 resourcestring
   SWrongFileFormat = 'Wrong file format';
-
+  SDescription = 'Description';
+  SMeaning = 'Meaning';
+  SAcronym = 'Acronym';
+  SNone = 'None';
+  SNewItem = 'New item';
+  SSkip = 'Skip';
+
+
+procedure Translate;
+begin
+  ImportVariableString[ivAcronym] := SAcronym;
+  ImportVariableString[ivNone] := SNone;
+  ImportVariableString[ivMeaning] := SMeaning;
+  ImportVariableString[ivDescription] := SDescription;
+  ImportPatternFlagString[ipfNone] := SNone;
+  ImportPatternFlagString[ipfNewItem] := SNewItem;
+  ImportPatternFlagString[ipfSkip] := SSkip;
+end;
 
 function AcronymComparer(Item1, Item2: Pointer): Integer;