From 9d0e64788e008ff544d0a591ae756445d20a3203 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 27 Aug 2022 19:40:08 +0000 Subject: [PATCH] tvplanit: Improvements in German translation, based on some proposals in report #39040 by forum user Nicole. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8420 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/tvplanit/languages/vpsr.de.po | 45 +++++----- components/tvplanit/languages/vpsr.en.po | 9 +- components/tvplanit/languages/vpsr.fi.po | 7 +- components/tvplanit/languages/vpsr.fr.po | 8 +- components/tvplanit/languages/vpsr.nl.po | 8 +- components/tvplanit/languages/vpsr.pl.po | 8 +- components/tvplanit/languages/vpsr.pot | 7 +- components/tvplanit/languages/vpsr.ru.po | 8 +- components/tvplanit/source/include/vpsr.inc | 8 +- components/tvplanit/source/vpedelem.lfm | 92 ++++++++++----------- components/tvplanit/source/vpedfmt.lfm | 55 ++++++------ components/tvplanit/source/vpflxds.pas | 8 +- 12 files changed, 123 insertions(+), 140 deletions(-) diff --git a/components/tvplanit/languages/vpsr.de.po b/components/tvplanit/languages/vpsr.de.po index 07431f0da..10ff5be5b 100644 --- a/components/tvplanit/languages/vpsr.de.po +++ b/components/tvplanit/languages/vpsr.de.po @@ -41,7 +41,7 @@ msgstr "Adresse:" #: vpsr.rsafriday msgid "Fri" -msgstr "Fre" +msgstr "Fr" #: vpsr.rsagelbl msgid "Age:" @@ -66,7 +66,7 @@ msgstr "G&anztägiges Ereignis" #: vpsr.rsamonday msgid "Mon" -msgstr "Mon" +msgstr "Mo" #: vpsr.rsanniversarylbl msgid "Anniversary:" @@ -78,7 +78,7 @@ msgstr "Termin" #: vpsr.rsasaturday msgid "Sat" -msgstr "Sam" +msgstr "Sa" #: vpsr.rsassignedcategory msgid "Assigned category" @@ -86,19 +86,19 @@ msgstr "Zugewiesene Kategorie" #: vpsr.rsasunday msgid "Sun" -msgstr "Son" +msgstr "So" #: vpsr.rsathursday msgid "Thu" -msgstr "Don" +msgstr "Do" #: vpsr.rsatuesday msgid "Tue" -msgstr "Die" +msgstr "Di" #: vpsr.rsawednesday msgid "Wed" -msgstr "Mit" +msgstr "Mi" #: vpsr.rsbackwardtimeserror msgid "The end time cannot precede the start time." @@ -465,7 +465,7 @@ msgstr "E-Mail" #: vpsr.rsendtimelbl msgid "End time:" -msgstr "Ende-Zeit:" +msgstr "Ende:" #: vpsr.rsevent msgctxt "vpsr.rsevent" @@ -791,10 +791,6 @@ msgstr "N" msgid "No alarm" msgstr "Ohne Alarm" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "TCanvas wurde nicht zugewiesen" - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -806,7 +802,7 @@ msgstr "Komponente muss mit einem TVpControlLink verbunden sein" #: vpsr.rsnodayincrement msgid "Day increment unit not specified." -msgstr "Intervall nicht angegeben." +msgstr "Einheit für das Zeitintervall nicht angegeben." #: vpsr.rsnoeventitemsfoundinical #, object-pascal-format @@ -839,7 +835,7 @@ msgstr "keine" #: vpsr.rsnoprintformatname msgid "Please supply a format name" -msgstr "Bitte geben Sie eine Format-Bezeichnung an" +msgstr "Bitte geben Sie einen Namen für das Format an" #: vpsr.rsnoprintformats msgid "No print formats have been defined" @@ -1224,7 +1220,7 @@ msgstr "Datum auswählen" #: vpsr.rsselectresource msgid "No resource has been selected. Would you like to select one now?" -msgstr "Keine Ressource ist auswählt worden. Möchten Sie jetzt eine auswählen?" +msgstr "Keine Ressource ausgewählt. Möchten Sie jetzt eine wählen?" #: vpsr.rsshapebtn msgid "Shape..." @@ -1246,7 +1242,7 @@ msgstr "&Später" #: vpsr.rssnoozecaption msgid "Click &Snooze to be reminded again in:" -msgstr "Auf \"Später\" klicken, um erinnert zu werden in:" +msgstr "Auf \"&Später\" klicken, um noch einmal erinnert zu werden in:" #: vpsr.rssound msgid "Sound" @@ -1258,19 +1254,19 @@ msgstr "Klang-Suche" #: vpsr.rssqlupdateerror msgid "Error: Unable to update " -msgstr "Fehler: Kann nicht updaten " +msgstr "Fehler: Update nicht möglich " #: vpsr.rsstartendtimeerror msgid "Incorrect order of start and end times. Do you want to exchange them?" -msgstr "Falsche Reihenfolge der Start- und Ende-Zeit. Wollen Sie die beiden vertauschen?" +msgstr "Falsche Reihenfolge der Zeiten für Beginn und Ende. Wollen Sie die beiden vertauschen?" #: vpsr.rsstartendtimesequal msgid "Start and end times cannot be equal." -msgstr "Start- und Ende-Zeit können nicht zusammenfallen." +msgstr "Die Zeiten für Beginn und Ende müssen unterschiedlich sein." #: vpsr.rsstarttimelbl msgid "Start time:" -msgstr "Start-Zeit:" +msgstr "Beginn:" #: vpsr.rsstatelbl msgid "State:" @@ -1296,7 +1292,7 @@ msgstr "Aufgabe fertiggestellt" #: vpsr.rstaskitems msgid "Task items" -msgstr "Aufgaben-Einträge" +msgstr "Aufgaben" #: vpsr.rstaskpopupadd msgid "Add task..." @@ -1378,8 +1374,9 @@ msgid "Tuesday" msgstr "Dienstag" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " -msgstr "Fehler: Kann nicht öffnen " +#, object-pascal-format +msgid "Error: Unable to open %s" +msgstr "Fehler: %s kann nicht geöffnet werden" #: vpsr.rsuntitled msgid "Untitled" @@ -1481,7 +1478,7 @@ msgstr "%d Minuten" #: vpsr.rsyearisrequired msgid "Error: Year is required." -msgstr "Fehler: Jahr wird benötigt." +msgstr "Fehler: Jahr ist erforderlich." #: vpsr.rsyearlybydate msgid "Yearly by date" diff --git a/components/tvplanit/languages/vpsr.en.po b/components/tvplanit/languages/vpsr.en.po index 3900fe061..e2816f319 100644 --- a/components/tvplanit/languages/vpsr.en.po +++ b/components/tvplanit/languages/vpsr.en.po @@ -783,10 +783,6 @@ msgstr "N" msgid "No alarm" msgstr "No alarm" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "TCanvas not assigned" - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -1360,8 +1356,9 @@ msgid "Tuesday" msgstr "Tuesday" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " -msgstr "Error: Unable to open " +#, object-pascal-format +msgid "Error: Unable to open %s" +msgstr "Error: Unable to open %s" #: vpsr.rsuntitled msgid "Untitled" diff --git a/components/tvplanit/languages/vpsr.fi.po b/components/tvplanit/languages/vpsr.fi.po index cb30e2711..0cf78c729 100644 --- a/components/tvplanit/languages/vpsr.fi.po +++ b/components/tvplanit/languages/vpsr.fi.po @@ -782,10 +782,6 @@ msgstr "" msgid "No alarm" msgstr "" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "" - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -1370,7 +1366,8 @@ msgid "Tuesday" msgstr "Tiistai" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " +#, object-pascal-format +msgid "Error: Unable to open %s" msgstr "" #: vpsr.rsuntitled diff --git a/components/tvplanit/languages/vpsr.fr.po b/components/tvplanit/languages/vpsr.fr.po index efbbb5dad..1cca2902b 100644 --- a/components/tvplanit/languages/vpsr.fr.po +++ b/components/tvplanit/languages/vpsr.fr.po @@ -797,10 +797,6 @@ msgstr "" msgid "No alarm" msgstr "" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "TCanvas non spécifié" - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -1386,7 +1382,9 @@ msgid "Tuesday" msgstr "Mardi" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " +#, object-pascal-format, fuzzy, badformat +#| msgid "Error: Unable to open " +msgid "Error: Unable to open %s" msgstr "Erreur: Incapable d'ouvrir" #: vpsr.rsuntitled diff --git a/components/tvplanit/languages/vpsr.nl.po b/components/tvplanit/languages/vpsr.nl.po index 80a1a752f..b91c7ef7a 100644 --- a/components/tvplanit/languages/vpsr.nl.po +++ b/components/tvplanit/languages/vpsr.nl.po @@ -791,10 +791,6 @@ msgstr "N" msgid "No alarm" msgstr "" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "TCanvas is niet toegewezen." - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -1380,7 +1376,9 @@ msgid "Tuesday" msgstr "Dinsdag" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " +#, object-pascal-format, fuzzy, badformat +#| msgid "Error: Unable to open " +msgid "Error: Unable to open %s" msgstr "Fout: Openen niet mogelijk " #: vpsr.rsuntitled diff --git a/components/tvplanit/languages/vpsr.pl.po b/components/tvplanit/languages/vpsr.pl.po index ac5ab9fd4..add33f03c 100644 --- a/components/tvplanit/languages/vpsr.pl.po +++ b/components/tvplanit/languages/vpsr.pl.po @@ -791,10 +791,6 @@ msgstr "N" msgid "No alarm" msgstr "" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "TCanvas nie został przypisany." - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -1379,7 +1375,9 @@ msgid "Tuesday" msgstr "Wtorek" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " +#, object-pascal-format, fuzzy, badformat +#| msgid "Error: Unable to open " +msgid "Error: Unable to open %s" msgstr "Błąd: Nie mogę otworzyć" #: vpsr.rsuntitled diff --git a/components/tvplanit/languages/vpsr.pot b/components/tvplanit/languages/vpsr.pot index cf294d1df..109be3929 100644 --- a/components/tvplanit/languages/vpsr.pot +++ b/components/tvplanit/languages/vpsr.pot @@ -773,10 +773,6 @@ msgstr "" msgid "No alarm" msgstr "" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "" - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -1350,7 +1346,8 @@ msgid "Tuesday" msgstr "" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " +#, object-pascal-format +msgid "Error: Unable to open %s" msgstr "" #: vpsr.rsuntitled diff --git a/components/tvplanit/languages/vpsr.ru.po b/components/tvplanit/languages/vpsr.ru.po index f52d3f9cd..484627e9c 100644 --- a/components/tvplanit/languages/vpsr.ru.po +++ b/components/tvplanit/languages/vpsr.ru.po @@ -791,10 +791,6 @@ msgstr "" msgid "No alarm" msgstr "" -#: vpsr.rsnocanvas -msgid "TCanvas not assigned" -msgstr "" - #: vpsr.rsnocontactsfoundinvcard #, object-pascal-format msgid "No contact items found in \"%s\"." @@ -1378,7 +1374,9 @@ msgid "Tuesday" msgstr "Вторник" #: vpsr.rsunabletoopen -msgid "Error: Unable to open " +#, object-pascal-format, fuzzy, badformat +#| msgid "Error: Unable to open " +msgid "Error: Unable to open %s" msgstr "Ошибка открытия" #: vpsr.rsuntitled diff --git a/components/tvplanit/source/include/vpsr.inc b/components/tvplanit/source/include/vpsr.inc index 27867c626..fa5ade1e3 100644 --- a/components/tvplanit/source/include/vpsr.inc +++ b/components/tvplanit/source/include/vpsr.inc @@ -26,6 +26,11 @@ {* *} {* ***** END LICENSE BLOCK ***** *} +{ Internal message texts not meant to be seen by the application user. } +const + RSNoCanvas = 'TCanvas not assigned'; + + {Visual PlanIt String Resources - To create language specific versions of Visual PlanIt controls, translate these strings to the desired language and re-compile your application.} @@ -61,7 +66,7 @@ resourcestring RSFailToCreateResource = 'Error: Failure while creating Resource.'; RSDuplicateResource = 'Error: Duplicate resource.'; RSInvalidTableSpecified = 'Error: Invalid table specified.'; - RSUnableToOpen = 'Error: Unable to open '; + RSUnableToOpen = 'Error: Unable to open %s'; RSSQLUpdateError = 'Error: Unable to update '; {!!.01} RSNoFilenameSpecified = 'Error: No datastore filename specified.'; @@ -530,6 +535,5 @@ resourcestring RSOwnerNotWinCtrl = 'Owner must be a TWinControl descendent'; RSNoControlLink = 'Component must be linked to a TVpControlLink'; RSNoPrintFormats = 'No print formats have been defined'; {!!.01} - RSNoCanvas = 'TCanvas not assigned'; {!!.01} RSNoLocalizationFile = 'Localization file not found.'; {!!.02} diff --git a/components/tvplanit/source/vpedelem.lfm b/components/tvplanit/source/vpedelem.lfm index 0c7827feb..53ceab15a 100644 --- a/components/tvplanit/source/vpedelem.lfm +++ b/components/tvplanit/source/vpedelem.lfm @@ -1,24 +1,23 @@ object frmEditElement: TfrmEditElement Left = 288 - Height = 465 + Height = 447 Top = 321 - Width = 608 + Width = 473 HorzScrollBar.Page = 378 VertScrollBar.Page = 444 AutoSize = True BorderStyle = bsDialog Caption = 'Edit Element' - ClientHeight = 465 - ClientWidth = 608 + ClientHeight = 447 + ClientWidth = 473 OnCreate = FormCreate OnShow = FormShow Position = poScreenCenter - LCLVersion = '1.6.4.0' object gbVisual: TGroupBox Left = 12 Height = 144 Top = 196 - Width = 584 + Width = 449 Align = alTop AutoSize = True BorderSpacing.Left = 12 @@ -26,7 +25,7 @@ object frmEditElement: TfrmEditElement BorderSpacing.Right = 12 Caption = ' Visual ' ClientHeight = 124 - ClientWidth = 580 + ClientWidth = 445 Font.Style = [fsBold] ParentFont = False TabOrder = 3 @@ -34,7 +33,7 @@ object frmEditElement: TfrmEditElement AnchorSideLeft.Control = rgRotation AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = gbVisual - Left = 102 + Left = 104 Height = 116 Top = 0 Width = 106 @@ -44,7 +43,7 @@ object frmEditElement: TfrmEditElement BorderSpacing.Bottom = 8 BorderSpacing.InnerBorder = 4 Caption = ' Measurement ' - ChildSizing.LeftRightSpacing = 6 + ChildSizing.LeftRightSpacing = 16 ChildSizing.TopBottomSpacing = 6 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.EnlargeVertical = crsHomogenousChildResize @@ -71,14 +70,14 @@ object frmEditElement: TfrmEditElement Left = 8 Height = 116 Top = 0 - Width = 78 + Width = 80 AutoFill = True AutoSize = True BorderSpacing.Left = 8 BorderSpacing.Bottom = 8 BorderSpacing.InnerBorder = 4 Caption = ' Rotation ' - ChildSizing.LeftRightSpacing = 6 + ChildSizing.LeftRightSpacing = 16 ChildSizing.TopBottomSpacing = 6 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.EnlargeVertical = crsHomogenousChildResize @@ -87,7 +86,7 @@ object frmEditElement: TfrmEditElement ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 ClientHeight = 96 - ClientWidth = 74 + ClientWidth = 76 ItemIndex = 0 Items.Strings = ( '0' @@ -104,7 +103,7 @@ object frmEditElement: TfrmEditElement AnchorSideTop.Control = rgMeasurement AnchorSideTop.Side = asrCenter AnchorSideBottom.Side = asrBottom - Left = 332 + Left = 334 Height = 54 Top = 31 Width = 99 @@ -128,6 +127,7 @@ object frmEditElement: TfrmEditElement Anchors = [akTop, akRight] BorderSpacing.Right = 8 Caption = 'Height:' + Color = clDefault FocusControl = edHeight ParentColor = False end @@ -161,7 +161,6 @@ object frmEditElement: TfrmEditElement OnClick = UpDownClick Position = 0 TabOrder = 1 - Wrap = False end object LblWidth: TLabel AnchorSideTop.Control = edWidth @@ -174,6 +173,7 @@ object frmEditElement: TfrmEditElement Anchors = [akTop, akRight] BorderSpacing.Right = 8 Caption = 'Width:' + Color = clDefault FocusControl = edWidth ParentColor = False end @@ -206,7 +206,6 @@ object frmEditElement: TfrmEditElement OnClick = UpDownClick Position = 0 TabOrder = 3 - Wrap = False end object BevelHeightWidth: TBevel AnchorSideLeft.Control = HeightWidthPanel @@ -226,7 +225,7 @@ object frmEditElement: TfrmEditElement AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = rgMeasurement AnchorSideTop.Side = asrCenter - Left = 224 + Left = 226 Height = 54 Top = 31 Width = 92 @@ -252,14 +251,15 @@ object frmEditElement: TfrmEditElement AnchorSideTop.Control = edTop AnchorSideTop.Side = asrCenter AnchorSideRight.Control = edTop - Left = 1 + Left = 2 Height = 15 Top = 4 - Width = 23 + Width = 22 Anchors = [akTop, akRight] BorderSpacing.Left = 1 BorderSpacing.Right = 8 Caption = 'Top:' + Color = clDefault FocusControl = edTop ParentColor = False end @@ -291,7 +291,6 @@ object frmEditElement: TfrmEditElement OnClick = UpDownClick Position = 0 TabOrder = 1 - Wrap = False end object udLeft: TUpDown AnchorSideLeft.Side = asrBottom @@ -309,7 +308,6 @@ object frmEditElement: TfrmEditElement OnClick = UpDownClick Position = 0 TabOrder = 2 - Wrap = False end object edLeft: TEdit AnchorSideTop.Side = asrBottom @@ -336,6 +334,7 @@ object frmEditElement: TfrmEditElement BorderSpacing.Left = 1 BorderSpacing.Right = 8 Caption = 'Left:' + Color = clDefault FocusControl = edLeft ParentColor = False end @@ -346,10 +345,10 @@ object frmEditElement: TfrmEditElement AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = rgMeasurement AnchorSideBottom.Side = asrBottom - Left = 262 + Left = 266 Height = 19 Top = 97 - Width = 54 + Width = 52 Alignment = taLeftJustify Anchors = [akRight, akBottom] Caption = 'Visible' @@ -361,7 +360,7 @@ object frmEditElement: TfrmEditElement Left = 12 Height = 54 Top = 352 - Width = 584 + Width = 449 Align = alTop AutoSize = True BorderSpacing.Left = 12 @@ -370,7 +369,7 @@ object frmEditElement: TfrmEditElement BorderSpacing.Bottom = 6 Caption = ' Caption ' ClientHeight = 34 - ClientWidth = 580 + ClientWidth = 445 Font.Style = [fsBold] ParentFont = False TabOrder = 4 @@ -384,6 +383,7 @@ object frmEditElement: TfrmEditElement Width = 27 BorderSpacing.Left = 8 Caption = 'Text: ' + Color = clDefault FocusControl = edCaptionText ParentColor = False ParentFont = False @@ -393,7 +393,7 @@ object frmEditElement: TfrmEditElement AnchorSideTop.Side = asrCenter AnchorSideRight.Control = gbCaption AnchorSideRight.Side = asrBottom - Left = 513 + Left = 378 Height = 25 Top = 1 Width = 59 @@ -413,7 +413,7 @@ object frmEditElement: TfrmEditElement Left = 43 Height = 23 Top = 2 - Width = 466 + Width = 331 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 8 BorderSpacing.Top = 2 @@ -428,7 +428,7 @@ object frmEditElement: TfrmEditElement Left = 12 Height = 23 Top = 8 - Width = 584 + Width = 449 Align = alTop AutoSize = True BorderSpacing.Left = 12 @@ -437,7 +437,7 @@ object frmEditElement: TfrmEditElement BorderSpacing.Bottom = 8 BevelOuter = bvNone ClientHeight = 23 - ClientWidth = 584 + ClientWidth = 449 TabOrder = 0 object lblName: TLabel AnchorSideTop.Control = edName @@ -447,6 +447,7 @@ object frmEditElement: TfrmEditElement Top = 4 Width = 38 Caption = 'Name: ' + Color = clDefault ParentColor = False end object edName: TEdit @@ -455,7 +456,7 @@ object frmEditElement: TfrmEditElement Left = 42 Height = 23 Top = 0 - Width = 542 + Width = 407 Align = alRight Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 4 @@ -466,7 +467,7 @@ object frmEditElement: TfrmEditElement Left = 12 Height = 51 Top = 133 - Width = 586 + Width = 451 Align = alTop AutoSize = True BorderSpacing.Left = 12 @@ -474,7 +475,7 @@ object frmEditElement: TfrmEditElement BorderSpacing.Right = 10 BevelOuter = bvNone ClientHeight = 51 - ClientWidth = 586 + ClientWidth = 451 TabOrder = 2 object gbDayOffset: TGroupBox AnchorSideTop.Control = Panel2 @@ -522,7 +523,6 @@ object frmEditElement: TfrmEditElement Min = 0 Position = 0 TabOrder = 1 - Wrap = False end end object rgDayOffsetUnit: TRadioGroup @@ -533,7 +533,7 @@ object frmEditElement: TfrmEditElement Left = 108 Height = 51 Top = 0 - Width = 478 + Width = 343 Anchors = [akTop, akLeft, akRight] AutoFill = True AutoSize = True @@ -548,7 +548,7 @@ object frmEditElement: TfrmEditElement ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 4 ClientHeight = 31 - ClientWidth = 474 + ClientWidth = 339 Columns = 4 ItemIndex = 0 Items.Strings = ( @@ -565,7 +565,7 @@ object frmEditElement: TfrmEditElement Left = 0 Height = 25 Top = 414 - Width = 596 + Width = 461 Align = alTop AutoSize = True BorderSpacing.Top = 8 @@ -573,7 +573,7 @@ object frmEditElement: TfrmEditElement BorderSpacing.Bottom = 8 BevelOuter = bvNone ClientHeight = 25 - ClientWidth = 596 + ClientWidth = 461 TabOrder = 5 object btnShape: TButton AnchorSideLeft.Control = ButtonPanel @@ -589,25 +589,23 @@ object frmEditElement: TfrmEditElement TabOrder = 0 end object btnOk: TButton - Left = 459 + Left = 324 Height = 25 Top = 0 Width = 71 Align = alRight BorderSpacing.Right = 4 Caption = 'OK' - Default = True OnClick = btnOkClick TabOrder = 1 end object btnCancel: TButton - Left = 534 + Left = 399 Height = 25 Top = 0 Width = 62 Align = alRight AutoSize = True - Cancel = True Caption = 'Cancel' OnClick = btnCancelClick TabOrder = 2 @@ -617,7 +615,7 @@ object frmEditElement: TfrmEditElement Left = 12 Height = 78 Top = 43 - Width = 586 + Width = 451 Align = alTop AutoSize = True BorderSpacing.Left = 12 @@ -625,18 +623,18 @@ object frmEditElement: TfrmEditElement BorderSpacing.Right = 10 BevelOuter = bvNone ClientHeight = 78 - ClientWidth = 586 + ClientWidth = 451 TabOrder = 1 object rgItemType: TRadioGroup Left = 0 Height = 78 Top = 0 - Width = 586 + Width = 451 Align = alClient AutoFill = True BorderSpacing.InnerBorder = 4 Caption = 'Item Type ' - ChildSizing.LeftRightSpacing = 6 + ChildSizing.LeftRightSpacing = 16 ChildSizing.TopBottomSpacing = 6 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.EnlargeVertical = crsHomogenousChildResize @@ -645,7 +643,7 @@ object frmEditElement: TfrmEditElement ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 4 ClientHeight = 58 - ClientWidth = 582 + ClientWidth = 447 Columns = 4 ItemIndex = 0 Items.Strings = ( @@ -668,7 +666,7 @@ object frmEditElement: TfrmEditElement Font.Name = 'MS Sans Serif' MinFontSize = 0 MaxFontSize = 0 - left = 536 - top = 304 + Left = 536 + Top = 304 end end diff --git a/components/tvplanit/source/vpedfmt.lfm b/components/tvplanit/source/vpedfmt.lfm index a2a71ed11..9e35debc9 100644 --- a/components/tvplanit/source/vpedfmt.lfm +++ b/components/tvplanit/source/vpedfmt.lfm @@ -1,38 +1,37 @@ object frmEditFormat: TfrmEditFormat Left = 583 - Height = 199 + Height = 189 Top = 339 - Width = 347 + Width = 320 HorzScrollBar.Page = 328 VertScrollBar.Page = 188 AutoSize = True BorderStyle = bsDialog Caption = 'Edit Format' - ClientHeight = 199 - ClientWidth = 347 + ClientHeight = 189 + ClientWidth = 320 OnCreate = FormCreate OnShow = FormShow Position = poScreenCenter - LCLVersion = '1.6.4.0' object Panel1: TPanel Left = 8 - Height = 158 + Height = 148 Top = 8 - Width = 331 + Width = 304 Align = alClient AutoSize = True BorderSpacing.Left = 8 BorderSpacing.Top = 8 BorderSpacing.Right = 8 BevelOuter = bvNone - ClientHeight = 158 - ClientWidth = 331 + ClientHeight = 148 + ClientWidth = 304 TabOrder = 0 object LblName: TLabel AnchorSideTop.Control = edName AnchorSideTop.Side = asrCenter AnchorSideRight.Control = edName - Left = 77 + Left = 50 Height = 15 Top = 4 Width = 38 @@ -40,6 +39,7 @@ object frmEditFormat: TfrmEditFormat BorderSpacing.Left = 8 BorderSpacing.Right = 8 Caption = 'Name: ' + Color = clDefault FocusControl = edName ParentColor = False end @@ -47,7 +47,7 @@ object frmEditFormat: TfrmEditFormat AnchorSideTop.Control = edIncrement AnchorSideTop.Side = asrCenter AnchorSideRight.Control = edIncrement - Left = 35 + Left = 8 Height = 15 Top = 66 Width = 80 @@ -55,6 +55,7 @@ object frmEditFormat: TfrmEditFormat BorderSpacing.Left = 8 BorderSpacing.Right = 8 Caption = 'Day Increment:' + Color = clDefault FocusControl = edIncrement ParentColor = False end @@ -62,7 +63,7 @@ object frmEditFormat: TfrmEditFormat AnchorSideTop.Control = edDescription AnchorSideTop.Side = asrCenter AnchorSideRight.Control = edDescription - Left = 49 + Left = 22 Height = 15 Top = 35 Width = 66 @@ -70,6 +71,7 @@ object frmEditFormat: TfrmEditFormat BorderSpacing.Left = 8 BorderSpacing.Right = 8 Caption = 'Description: ' + Color = clDefault FocusControl = edDescription ParentColor = False end @@ -79,7 +81,7 @@ object frmEditFormat: TfrmEditFormat AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Panel1 AnchorSideRight.Side = asrBottom - Left = 123 + Left = 96 Height = 23 Top = 31 Width = 208 @@ -91,7 +93,7 @@ object frmEditFormat: TfrmEditFormat AnchorSideLeft.Control = edName AnchorSideTop.Control = edDescription AnchorSideTop.Side = asrBottom - Left = 123 + Left = 96 Height = 23 Top = 62 Width = 71 @@ -106,7 +108,7 @@ object frmEditFormat: TfrmEditFormat AnchorSideTop.Control = edIncrement AnchorSideTop.Side = asrCenter AnchorSideRight.Side = asrBottom - Left = 194 + Left = 167 Height = 23 Top = 62 Width = 12 @@ -115,13 +117,12 @@ object frmEditFormat: TfrmEditFormat Min = 0 Position = 0 TabOrder = 2 - Wrap = False end object edName: TEdit AnchorSideTop.Control = Panel1 AnchorSideRight.Control = Panel1 AnchorSideRight.Side = asrBottom - Left = 123 + Left = 96 Height = 23 Top = 0 Width = 208 @@ -136,14 +137,14 @@ object frmEditFormat: TfrmEditFormat AnchorSideRight.Side = asrBottom Left = 0 Height = 51 - Top = 93 - Width = 331 + Top = 97 + Width = 304 Anchors = [akTop, akLeft, akRight] AutoFill = True AutoSize = True - BorderSpacing.Top = 8 + BorderSpacing.Top = 12 Caption = ' Day Increment Unit ' - ChildSizing.LeftRightSpacing = 6 + ChildSizing.LeftRightSpacing = 16 ChildSizing.TopBottomSpacing = 6 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.EnlargeVertical = crsHomogenousChildResize @@ -152,7 +153,7 @@ object frmEditFormat: TfrmEditFormat ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 4 ClientHeight = 31 - ClientWidth = 327 + ClientWidth = 300 Columns = 4 ItemIndex = 0 Items.Strings = ( @@ -168,16 +169,16 @@ object frmEditFormat: TfrmEditFormat object ButtonPanel: TPanel Left = 0 Height = 33 - Top = 166 - Width = 347 + Top = 156 + Width = 320 Align = alBottom AutoSize = True BevelOuter = bvNone ClientHeight = 33 - ClientWidth = 347 + ClientWidth = 320 TabOrder = 1 object btnOk: TButton - Left = 231 + Left = 204 Height = 25 Top = 4 Width = 42 @@ -193,7 +194,7 @@ object frmEditFormat: TfrmEditFormat TabOrder = 0 end object btnCancel: TButton - Left = 277 + Left = 250 Height = 25 Top = 4 Width = 62 diff --git a/components/tvplanit/source/vpflxds.pas b/components/tvplanit/source/vpflxds.pas index f3ce144e4..2ca2bebdb 100644 --- a/components/tvplanit/source/vpflxds.pas +++ b/components/tvplanit/source/vpflxds.pas @@ -368,7 +368,7 @@ begin try FResourceDataSrc.DataSet.Open; except - raise Exception.Create(RSUnableToOpen + ResourceTableName); + raise Exception.CreateFmt(RSUnableToOpen, [ResourceTableName]); end; end; end; @@ -383,7 +383,7 @@ begin try FEventsDataSrc.DataSet.Open; except - raise Exception.Create(RSUnableToOpen + EventsTableName); + raise Exception.CreateFmt(RSUnableToOpen, [EventsTableName]); end; end; end; @@ -398,7 +398,7 @@ begin try FContactsDataSrc.DataSet.Open; except - raise Exception.Create(RSUnableToOpen + ContactsTableName); + raise Exception.CreateFmt(RSUnableToOpen, [ContactsTableName]); end; end; end; @@ -413,7 +413,7 @@ begin try FTasksDataSrc.DataSet.Open; except - raise Exception.Create(RSUnableToOpen + TasksTableName); + raise Exception.CreateFmt(RSUnableToOpen, [TasksTableName]); end; end; end;