From 03e1ff9059f72ea2b505ad6584ad08b1c45edbdb Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 12 Oct 2022 11:33:16 +0000 Subject: [PATCH] tvplanit: Add "Don't ask again" checkbox to VpPrtFmt editor save prompt by using a TTaskDialog. Update resource strings and translations. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8540 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../tvplanit/examples/fulldemo/demo.lpi | 3 +- .../tvplanit/examples/fulldemo/demomain.lfm | 20 +++++- .../tvplanit/examples/fulldemo/demomain.lrj | 5 +- .../tvplanit/examples/fulldemo/demomain.pas | 7 ++ components/tvplanit/languages/demo.de.po | 17 +++-- components/tvplanit/languages/demo.en.po | 15 ++--- components/tvplanit/languages/demo.fi.po | 12 ++-- components/tvplanit/languages/demo.nl.po | 12 ++-- components/tvplanit/languages/demo.pl.po | 16 +++-- components/tvplanit/languages/demo.pot | 12 ++-- components/tvplanit/languages/demo.ru.po | 12 ++-- components/tvplanit/languages/vpsr.de.po | 66 ++++++++++++++----- components/tvplanit/languages/vpsr.en.po | 65 +++++++++++++----- components/tvplanit/languages/vpsr.fi.po | 44 ++++++++++--- components/tvplanit/languages/vpsr.fr.po | 55 ++++++++++++---- components/tvplanit/languages/vpsr.nl.po | 48 +++++++++++--- components/tvplanit/languages/vpsr.pl.po | 63 +++++++++++++++--- components/tvplanit/languages/vpsr.pot | 44 ++++++++++--- components/tvplanit/languages/vpsr.ru.po | 54 ++++++++++++--- .../tvplanit/source/design/vpprtfmted.pas | 5 +- components/tvplanit/source/include/vpsr.inc | 33 ++++++---- components/tvplanit/source/vpcontactgrid.pas | 4 +- components/tvplanit/source/vpedfmtlst.pas | 36 +++++++--- components/tvplanit/source/vpprtfmt.pas | 2 + components/tvplanit/source/vpprtfmtdlg.pas | 5 ++ 25 files changed, 479 insertions(+), 176 deletions(-) diff --git a/components/tvplanit/examples/fulldemo/demo.lpi b/components/tvplanit/examples/fulldemo/demo.lpi index 3bb87dc24..46eb29633 100644 --- a/components/tvplanit/examples/fulldemo/demo.lpi +++ b/components/tvplanit/examples/fulldemo/demo.lpi @@ -19,8 +19,9 @@ - + + diff --git a/components/tvplanit/examples/fulldemo/demomain.lfm b/components/tvplanit/examples/fulldemo/demomain.lfm index 4495c07e7..3e21a9d7d 100644 --- a/components/tvplanit/examples/fulldemo/demomain.lfm +++ b/components/tvplanit/examples/fulldemo/demomain.lfm @@ -58,7 +58,7 @@ object MainForm: TMainForm Height = 548 Top = 48 Width = 834 - PageIndex = 0 + PageIndex = 4 Align = alClient TabOrder = 1 TabStop = True @@ -697,6 +697,20 @@ object MainForm: TMainForm OnChange = CbApplyCategoryInfosChange TabOrder = 9 end + object CbShowSavePrompt: TCheckBox + AnchorSideLeft.Control = CbAllowInplaceEditing + AnchorSideTop.Control = CbApplyCategoryInfos + AnchorSideTop.Side = asrBottom + Left = 316 + Height = 19 + Top = 213 + Width = 170 + BorderSpacing.Top = 16 + Caption = 'Prompt to save print formats' + Checked = True + State = cbChecked + TabOrder = 10 + end end end end @@ -1303,11 +1317,11 @@ object MainForm: TMainForm Caption = '-' end object MnuEditPrintFormats: TMenuItem - Caption = 'Edit print formats...' + Caption = 'Edit print templates...' OnClick = MnuEditPrintFormatsClick end object MnuLoadPrintFormats: TMenuItem - Caption = 'Load print formats...' + Caption = 'Load print templates from file...' OnClick = MnuLoadPrintFormatsClick end object MenuItem3: TMenuItem diff --git a/components/tvplanit/examples/fulldemo/demomain.lrj b/components/tvplanit/examples/fulldemo/demomain.lrj index e3f9cf609..e13ce5d0c 100644 --- a/components/tvplanit/examples/fulldemo/demomain.lrj +++ b/components/tvplanit/examples/fulldemo/demomain.lrj @@ -22,11 +22,12 @@ {"hash":216343376,"name":"tmainform.cbdragdroptransparent.caption","sourcebytes":[84,114,97,110,115,112,97,114,101,110,116,32,100,114,97,103,32,97,110,100,32,100,114,111,112],"value":"Transparent drag and drop"}, {"hash":17060163,"name":"tmainform.cbshoweventhints.caption","sourcebytes":[83,104,111,119,32,101,118,101,110,116,32,97,110,100,32,99,111,110,116,97,99,116,32,104,105,110,116,115],"value":"Show event and contact hints"}, {"hash":245274983,"name":"tmainform.cbapplycategoryinfos.caption","sourcebytes":[65,112,112,108,121,32,99,97,116,101,103,111,114,121,32,99,111,108,111,114,115,32,116,111,32,119,101,101,107,32,97,110,100,32,109,111,110,116,104,32,118,105,101,119],"value":"Apply category colors to week and month view"}, +{"hash":151956947,"name":"tmainform.cbshowsaveprompt.caption","sourcebytes":[80,114,111,109,112,116,32,116,111,32,115,97,118,101,32,112,114,105,110,116,32,102,111,114,109,97,116,115],"value":"Prompt to save print formats"}, {"hash":315429,"name":"tmainform.menuitem1.caption","sourcebytes":[70,105,108,101],"value":"File"}, {"hash":161391310,"name":"tmainform.mnuprintpreview.caption","sourcebytes":[80,114,105,110,116,32,112,114,101,118,105,101,119,46,46,46],"value":"Print preview..."}, {"hash":151352958,"name":"tmainform.mnuprint.caption","sourcebytes":[80,114,105,110,116,46,46,46],"value":"Print..."}, -{"hash":109668078,"name":"tmainform.mnueditprintformats.caption","sourcebytes":[69,100,105,116,32,112,114,105,110,116,32,102,111,114,109,97,116,115,46,46,46],"value":"Edit print formats..."}, -{"hash":25869902,"name":"tmainform.mnuloadprintformats.caption","sourcebytes":[76,111,97,100,32,112,114,105,110,116,32,102,111,114,109,97,116,115,46,46,46],"value":"Load print formats..."}, +{"hash":137712942,"name":"tmainform.mnueditprintformats.caption","sourcebytes":[69,100,105,116,32,112,114,105,110,116,32,116,101,109,112,108,97,116,101,115,46,46,46],"value":"Edit print templates..."}, +{"hash":252908494,"name":"tmainform.mnuloadprintformats.caption","sourcebytes":[76,111,97,100,32,112,114,105,110,116,32,116,101,109,112,108,97,116,101,115,32,102,114,111,109,32,102,105,108,101,46,46,46],"value":"Load print templates from file..."}, {"hash":363524,"name":"tmainform.mnuquit.caption","sourcebytes":[81,117,105,116],"value":"Quit"}, {"hash":184026309,"name":"tmainform.mnumaintenance.caption","sourcebytes":[77,97,105,110,116,101,110,97,110,99,101],"value":"Maintenance"}, {"hash":174903555,"name":"tmainform.mnuresources.caption","sourcebytes":[82,101,115,111,117,114,99,101,115],"value":"Resources"}, diff --git a/components/tvplanit/examples/fulldemo/demomain.pas b/components/tvplanit/examples/fulldemo/demomain.pas index e0310fe74..bf9ee20e1 100644 --- a/components/tvplanit/examples/fulldemo/demomain.pas +++ b/components/tvplanit/examples/fulldemo/demomain.pas @@ -35,6 +35,7 @@ type CbDragDropTransparent: TCheckBox; CbShowEventHints: TCheckBox; CbApplyCategoryInfos: TCheckBox; + CbShowSavePrompt: TCheckBox; lblOtherResources: TLabel; lblResources: TLabel; lbOtherResources: TCheckListBox; @@ -723,7 +724,9 @@ end; procedure TMainForm.MnuEditPrintFormatsClick(Sender: TObject); begin VpPrintFormatEditDialog1.DrawingStyle := VpWeekView1.DrawingStyle; + VpPrintFormatEditDialog1.ShowSavePrompt := CbShowSavePrompt.Checked; VpPrintFormatEditDialog1.Execute; + CbShowSavePrompt.Checked := VpPrintFormatEditDialog1.ShowSavePrompt; end; procedure TMainForm.MnuLoadPrintFormatsClick(Sender: TObject); @@ -1006,6 +1009,9 @@ begin CbApplyCategoryInfos.Checked := ini.ReadBool('Settings', 'ApplyCategoryInfos', CbApplyCategoryInfos.Checked); CbApplyCategoryInfosChange(nil); + + CbShowSavePrompt.Checked := ini.ReadBool('Settings', 'ShowSavePrompt', + CbShowSaveprompt.Checked); FResID := ini.ReadInteger('Data', 'ResourceID', -1); finally @@ -1062,6 +1068,7 @@ begin ini.WriteBool('Settings', 'DragAndDropTransparent', CbDragDropTransparent.Checked); ini.WriteBool('Settings', 'ShowEventHints', CbShowEventHints.Checked); ini.WriteBool('Settings', 'ApplyCategoryInfos', CbApplyCategoryInfos.Checked); + ini.WriteBool('Settings', 'ShowSavePrompt', CbShowSavePrompt.Checked); ini.WriteInteger('Data', 'ResourceID', VpControlLink1.Datastore.ResourceID); finally diff --git a/components/tvplanit/languages/demo.de.po b/components/tvplanit/languages/demo.de.po index 77ffde3e4..2d22498e9 100644 --- a/components/tvplanit/languages/demo.de.po +++ b/components/tvplanit/languages/demo.de.po @@ -210,6 +210,10 @@ msgstr "30 Min" msgid "Show event and contact hints" msgstr "Hinweis-Texte für Termine und Kontakte anzeigen" +#: tmainform.cbshowsaveprompt.caption +msgid "Prompt to save print formats" +msgstr "Bestätigung zum Speichern von Druckvorlagen einholen" + #: tmainform.lbladdressbuilder.caption msgid "Address builder" msgstr "Adress-Baukasten" @@ -261,12 +265,12 @@ msgid "About Visual PlanIt" msgstr "Über Visual PlanIt" #: tmainform.mnueditprintformats.caption -msgid "Edit print formats..." -msgstr "Ausgabe-Formate bearbeiten..." +msgid "Edit print templates..." +msgstr "Druckvorlagen bearbeiten..." #: tmainform.mnuloadprintformats.caption -msgid "Load print formats..." -msgstr "Ausgabe-Formate laden..." +msgid "Load print templates from file..." +msgstr "Druckvorlagen von Datei laden..." #: tmainform.mnumaintenance.caption msgctxt "tmainform.mnumaintenance.caption" @@ -302,8 +306,3 @@ msgstr "Alle Aufgaben" #: tmainform.rbhidecompletedtasks.caption msgid "Hide completed tasks" msgstr "Erledigte Aufgaben verbergen" - -#: tmainform.titlelbl.caption -msgid "TitleLbl" -msgstr "" - diff --git a/components/tvplanit/languages/demo.en.po b/components/tvplanit/languages/demo.en.po index f3375bf4e..aa4a3b3a4 100644 --- a/components/tvplanit/languages/demo.en.po +++ b/components/tvplanit/languages/demo.en.po @@ -207,6 +207,10 @@ msgstr "30 Min" msgid "Show event and contact hints" msgstr "Show event and contact hints" +#: tmainform.cbshowsaveprompt.caption +msgid "Prompt to save print formats" +msgstr "Prompt to save print formats" + #: tmainform.lbladdressbuilder.caption msgid "Address builder" msgstr "Address builder" @@ -258,12 +262,12 @@ msgid "About Visual PlanIt" msgstr "About Visual PlanIt" #: tmainform.mnueditprintformats.caption -msgid "Edit print formats..." +msgid "Edit print templates..." msgstr "Edit print formats..." #: tmainform.mnuloadprintformats.caption -msgid "Load print formats..." -msgstr "Load print formats..." +msgid "Load print templates from file..." +msgstr "Load print formats from file..." #: tmainform.mnumaintenance.caption msgctxt "tmainform.mnumaintenance.caption" @@ -299,8 +303,3 @@ msgstr "All tasks" #: tmainform.rbhidecompletedtasks.caption msgid "Hide completed tasks" msgstr "Hide completed tasks" - -#: tmainform.titlelbl.caption -msgid "TitleLbl" -msgstr "TitleLbl" - diff --git a/components/tvplanit/languages/demo.fi.po b/components/tvplanit/languages/demo.fi.po index 4c470bf0d..7539f5f46 100644 --- a/components/tvplanit/languages/demo.fi.po +++ b/components/tvplanit/languages/demo.fi.po @@ -200,6 +200,10 @@ msgstr "" msgid "Show event and contact hints" msgstr "" +#: tmainform.cbshowsaveprompt.caption +msgid "Prompt to save print formats" +msgstr "" + #: tmainform.lbladdressbuilder.caption msgid "Address builder" msgstr "" @@ -251,11 +255,11 @@ msgid "About Visual PlanIt" msgstr "" #: tmainform.mnueditprintformats.caption -msgid "Edit print formats..." +msgid "Edit print templates..." msgstr "" #: tmainform.mnuloadprintformats.caption -msgid "Load print formats..." +msgid "Load print templates from file..." msgstr "" #: tmainform.mnumaintenance.caption @@ -294,7 +298,3 @@ msgstr "" msgid "Hide completed tasks" msgstr "" -#: tmainform.titlelbl.caption -msgid "TitleLbl" -msgstr "" - diff --git a/components/tvplanit/languages/demo.nl.po b/components/tvplanit/languages/demo.nl.po index f441bf240..a1d15cd26 100644 --- a/components/tvplanit/languages/demo.nl.po +++ b/components/tvplanit/languages/demo.nl.po @@ -199,6 +199,10 @@ msgstr "" msgid "Show event and contact hints" msgstr "" +#: tmainform.cbshowsaveprompt.caption +msgid "Prompt to save print formats" +msgstr "" + #: tmainform.lbladdressbuilder.caption msgid "Address builder" msgstr "" @@ -250,11 +254,11 @@ msgid "About Visual PlanIt" msgstr "" #: tmainform.mnueditprintformats.caption -msgid "Edit print formats..." +msgid "Edit print templates..." msgstr "" #: tmainform.mnuloadprintformats.caption -msgid "Load print formats..." +msgid "Load print templates from file..." msgstr "" #: tmainform.mnumaintenance.caption @@ -295,7 +299,3 @@ msgstr "" msgid "Hide completed tasks" msgstr "" -#: tmainform.titlelbl.caption -msgid "TitleLbl" -msgstr "" - diff --git a/components/tvplanit/languages/demo.pl.po b/components/tvplanit/languages/demo.pl.po index c6c3434bf..1cf2c5032 100644 --- a/components/tvplanit/languages/demo.pl.po +++ b/components/tvplanit/languages/demo.pl.po @@ -210,6 +210,10 @@ msgstr "30 min" msgid "Show event and contact hints" msgstr "Pokaż podpowiedzi dla wydarzeń i kontaktów" +#: tmainform.cbshowsaveprompt.caption +msgid "Prompt to save print formats" +msgstr "" + #: tmainform.lbladdressbuilder.caption msgid "Address builder" msgstr "Generator adresów" @@ -261,11 +265,15 @@ msgid "About Visual PlanIt" msgstr "O Visual PlanIt" #: tmainform.mnueditprintformats.caption -msgid "Edit print formats..." +#, fuzzy +#| msgid "Edit print formats..." +msgid "Edit print templates..." msgstr "Edytuj format wydruku..." #: tmainform.mnuloadprintformats.caption -msgid "Load print formats..." +#, fuzzy +#| msgid "Load print formats..." +msgid "Load print templates from file..." msgstr "Załaduj format wydruku..." #: tmainform.mnumaintenance.caption @@ -303,7 +311,3 @@ msgstr "Wszystkie zadania" msgid "Hide completed tasks" msgstr "Ukryj wykonane zadania" -#: tmainform.titlelbl.caption -msgid "TitleLbl" -msgstr "" - diff --git a/components/tvplanit/languages/demo.pot b/components/tvplanit/languages/demo.pot index 6bb2baed5..c4e95236f 100644 --- a/components/tvplanit/languages/demo.pot +++ b/components/tvplanit/languages/demo.pot @@ -197,6 +197,10 @@ msgstr "" msgid "Show event and contact hints" msgstr "" +#: tmainform.cbshowsaveprompt.caption +msgid "Prompt to save print formats" +msgstr "" + #: tmainform.lbladdressbuilder.caption msgid "Address builder" msgstr "" @@ -248,11 +252,11 @@ msgid "About Visual PlanIt" msgstr "" #: tmainform.mnueditprintformats.caption -msgid "Edit print formats..." +msgid "Edit print templates..." msgstr "" #: tmainform.mnuloadprintformats.caption -msgid "Load print formats..." +msgid "Load print templates from file..." msgstr "" #: tmainform.mnumaintenance.caption @@ -290,7 +294,3 @@ msgstr "" msgid "Hide completed tasks" msgstr "" -#: tmainform.titlelbl.caption -msgid "TitleLbl" -msgstr "" - diff --git a/components/tvplanit/languages/demo.ru.po b/components/tvplanit/languages/demo.ru.po index a1cbc6e38..dadf8a932 100644 --- a/components/tvplanit/languages/demo.ru.po +++ b/components/tvplanit/languages/demo.ru.po @@ -209,6 +209,10 @@ msgstr "" msgid "Show event and contact hints" msgstr "" +#: tmainform.cbshowsaveprompt.caption +msgid "Prompt to save print formats" +msgstr "" + #: tmainform.lbladdressbuilder.caption msgid "Address builder" msgstr "" @@ -260,11 +264,11 @@ msgid "About Visual PlanIt" msgstr "" #: tmainform.mnueditprintformats.caption -msgid "Edit print formats..." +msgid "Edit print templates..." msgstr "" #: tmainform.mnuloadprintformats.caption -msgid "Load print formats..." +msgid "Load print templates from file..." msgstr "" #: tmainform.mnumaintenance.caption @@ -305,7 +309,3 @@ msgstr "" msgid "Hide completed tasks" msgstr "" -#: tmainform.titlelbl.caption -msgid "TitleLbl" -msgstr "" - diff --git a/components/tvplanit/languages/vpsr.de.po b/components/tvplanit/languages/vpsr.de.po index 2ef97a0fa..75ceda18d 100644 --- a/components/tvplanit/languages/vpsr.de.po +++ b/components/tvplanit/languages/vpsr.de.po @@ -133,7 +133,7 @@ msgid "bottom line" msgstr "Linie unten" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "Web-Browser kann nicht gestartet werden. Bitte stellen Sie sicher, dass er in Ihrem System korrekt eingerichtet ist." #: vpsr.rsbrushcaption @@ -252,6 +252,10 @@ msgstr "Firma:" msgid "Completed on" msgstr "Fertiggestellt am" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "Bestätigung" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -425,6 +429,10 @@ msgstr "Beschreibung" msgid "Task" msgstr "Aufgabe" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "Nicht erneut nachfragen." + #: vpsr.rsduedatelabel msgctxt "vpsr.rsduedatelabel" msgid "Due date:" @@ -443,8 +451,8 @@ msgid "Edit element" msgstr "Element bearbeiten" #: vpsr.rseditformatcaption -msgid "Edit format" -msgstr "Format bearbeiten" +msgid "Edit template" +msgstr "Vorlage bearbeiten" #: vpsr.rseditingfolders msgid "Folder editor." @@ -455,13 +463,22 @@ msgid "Folder items editor." msgstr "Editor für Ordner-Einträge." #: vpsr.rseditprintformat -msgid "Edit Print Formats..." -msgstr "Druck-Formate bearbeiten..." +msgid "Edit Print Templates..." +msgstr "Druck-Vorlagen bearbeiten..." #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "Form bearbeiten" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" +"Ein Element mit Namen %s existiert bereits.\n" +"Bitte einen anderen Namen verwenden." + #: vpsr.rselements msgid "Elements:" msgstr "Elemente:" @@ -545,12 +562,12 @@ msgid "Font..." msgstr "Schriftart..." #: vpsr.rsformatlbl -msgid "Format:" -msgstr "Format:" +msgid "Template:" +msgstr "Vorlage: " #: vpsr.rsformats -msgid "Formats:" -msgstr "Formate:" +msgid "Templates:" +msgstr "Vorlagen:" #: vpsr.rsfriday msgid "Friday" @@ -853,12 +870,12 @@ msgid "none" msgstr "keine" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" -msgstr "Bitte geben Sie einen Namen für das Format an" +msgid "Please supply a template name" +msgstr "Bitte geben Sie einen Namen für die Vorlage an" #: vpsr.rsnoprintformats msgid "No print formats have been defined" -msgstr "Es sind keine Druckformate definiert" +msgstr "Es sind keine Druckvorlagen definiert" #: vpsr.rsnormal msgid "Normal" @@ -1106,9 +1123,18 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "&Drucken" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" +"Eine Druckvorlage mit Namen %s existiert bereits.\n" +"Bitte einen anderen Namen verwenden." + #: vpsr.rsprintformatdesigner -msgid "Print format designer" -msgstr "Druckformat-Designer" +msgid "Print template designer" +msgstr "Druckvorlagen-Designer" #: vpsr.rsprintorder msgid "Print order" @@ -1223,18 +1249,22 @@ msgid "Save file..." msgstr "Datei speichern..." #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" -msgstr "Format in Datei speichern?" +msgid "Save print template to file?" +msgstr "Druckvorlage in Datei speichern?" #: vpsr.rssaveformatchangestofilename #, object-pascal-format -msgid "Save format to \"%s\"?" -msgstr "Format speichern als \"%s\"?" +msgid "Save print template to \"%s\"?" +msgstr "Druckvorlage speichern als \"%s\"?" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "Als iCal-Datei exportieren" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "Druckvorlage speichern" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "Als vCard exportieren" diff --git a/components/tvplanit/languages/vpsr.en.po b/components/tvplanit/languages/vpsr.en.po index f8c979b79..52ed6bbb9 100644 --- a/components/tvplanit/languages/vpsr.en.po +++ b/components/tvplanit/languages/vpsr.en.po @@ -134,7 +134,7 @@ msgid "bottom line" msgstr "bottom line" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "Unable to start web browser. Make sure you have it properly setup on your system." #: vpsr.rsbrushcaption @@ -253,6 +253,10 @@ msgstr "Company:" msgid "Completed on" msgstr "Completed on" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "Confirmation" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -421,6 +425,10 @@ msgstr "Description" msgid "Task" msgstr "Task" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "Do not ask again." + #: vpsr.rsduedatelabel msgid "Due date:" msgstr "Due date:" @@ -438,8 +446,8 @@ msgid "Edit element" msgstr "Edit element" #: vpsr.rseditformatcaption -msgid "Edit format" -msgstr "Edit format" +msgid "Edit template" +msgstr "Edit template" #: vpsr.rseditingfolders msgid "Folder editor." @@ -450,13 +458,22 @@ msgid "Folder items editor." msgstr "Folder items editor." #: vpsr.rseditprintformat -msgid "Edit Print Formats..." -msgstr "Edit Print Formats..." +msgid "Edit Print Templates..." +msgstr "Edit Print Templates..." #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "Edit shape" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" +"An element named %s already exists.\n" +"Please use a different name." + #: vpsr.rselements msgid "Elements:" msgstr "Elements:" @@ -540,12 +557,12 @@ msgid "Font..." msgstr "Font..." #: vpsr.rsformatlbl -msgid "Format:" -msgstr "Format:" +msgid "Template:" +msgstr "Template:" #: vpsr.rsformats -msgid "Formats:" -msgstr "Formats:" +msgid "Templates:" +msgstr "Templates:" #: vpsr.rsfriday msgid "Friday" @@ -760,7 +777,6 @@ msgid "Error: Name cannot be empty." msgstr "Error: Name cannot be empty." #: vpsr.rsnamelbl -#| msgid "Name:" msgid "Name:" msgstr "Name:" @@ -847,8 +863,8 @@ msgid "none" msgstr "none" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" -msgstr "Please supply a format name" +msgid "Please supply a template name" +msgstr "Please supply a template name" #: vpsr.rsnoprintformats msgid "No print formats have been defined" @@ -1094,9 +1110,18 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "&Print" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" +"A print template named %s already exists.\n" +"Please use a different name." + #: vpsr.rsprintformatdesigner -msgid "Print format designer" -msgstr "Print format designer" +msgid "Print template designer" +msgstr "Print template designer" #: vpsr.rsprintorder msgid "Print order" @@ -1209,18 +1234,22 @@ msgid "Save file..." msgstr "Save file..." #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" -msgstr "Save format to file?" +msgid "Save print template to file?" +msgstr "Save print template to file?" #: vpsr.rssaveformatchangestofilename #, object-pascal-format -msgid "Save format to \"%s\"?" -msgstr "Save format to \"%s\"?" +msgid "Save print template to \"%s\"?" +msgstr "Save print format to \"%s\"?" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "Export to iCal file" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "Save print template" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "Export to vCard" diff --git a/components/tvplanit/languages/vpsr.fi.po b/components/tvplanit/languages/vpsr.fi.po index 86cfbd1fe..256e1771b 100644 --- a/components/tvplanit/languages/vpsr.fi.po +++ b/components/tvplanit/languages/vpsr.fi.po @@ -123,7 +123,7 @@ msgid "bottom line" msgstr "" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "" #: vpsr.rsbrushcaption @@ -242,6 +242,10 @@ msgstr "" msgid "Completed on" msgstr "" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -415,6 +419,10 @@ msgstr "" msgid "Task" msgstr "" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "" + #: vpsr.rsduedatelabel msgctxt "vpsr.rsduedatelabel" msgid "Due date:" @@ -433,7 +441,7 @@ msgid "Edit element" msgstr "" #: vpsr.rseditformatcaption -msgid "Edit format" +msgid "Edit template" msgstr "" #: vpsr.rseditingfolders @@ -445,13 +453,20 @@ msgid "Folder items editor." msgstr "" #: vpsr.rseditprintformat -msgid "Edit Print Formats..." +msgid "Edit Print Templates..." msgstr "" #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rselements msgid "Elements:" msgstr "" @@ -536,11 +551,11 @@ msgid "Font..." msgstr "" #: vpsr.rsformatlbl -msgid "Format:" +msgid "Template:" msgstr "" #: vpsr.rsformats -msgid "Formats:" +msgid "Templates:" msgstr "" #: vpsr.rsfriday @@ -846,7 +861,7 @@ msgid "none" msgstr "" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" +msgid "Please supply a template name" msgstr "" #: vpsr.rsnoprintformats @@ -1099,8 +1114,15 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rsprintformatdesigner -msgid "Print format designer" +msgid "Print template designer" msgstr "" #: vpsr.rsprintorder @@ -1214,18 +1236,22 @@ msgid "Save file..." msgstr "" #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" +msgid "Save print template to file?" msgstr "" #: vpsr.rssaveformatchangestofilename #, object-pascal-format -msgid "Save format to \"%s\"?" +msgid "Save print template to \"%s\"?" msgstr "" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "" diff --git a/components/tvplanit/languages/vpsr.fr.po b/components/tvplanit/languages/vpsr.fr.po index a8994a57f..dad518b70 100644 --- a/components/tvplanit/languages/vpsr.fr.po +++ b/components/tvplanit/languages/vpsr.fr.po @@ -139,7 +139,9 @@ msgid "bottom line" msgstr "" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +#, fuzzy +#| msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "Échec de démarrage de votre browser internet. Veuillez verifier que vous l'avez bien configuré sur votre système." #: vpsr.rsbrushcaption @@ -258,6 +260,10 @@ msgstr "Société:" msgid "Completed on" msgstr "Terminé le" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -431,6 +437,10 @@ msgstr "Déscription" msgid "Task" msgstr "Tache" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "" + #: vpsr.rsduedatelabel msgctxt "vpsr.rsduedatelabel" msgid "Due date:" @@ -449,7 +459,7 @@ msgid "Edit element" msgstr "" #: vpsr.rseditformatcaption -msgid "Edit format" +msgid "Edit template" msgstr "" #: vpsr.rseditingfolders @@ -461,13 +471,22 @@ msgid "Folder items editor." msgstr "Editeur d'éléments de dossier" #: vpsr.rseditprintformat -msgid "Edit Print Formats..." +#, fuzzy +#| msgid "Edit Print Formats..." +msgid "Edit Print Templates..." msgstr "Modifier les formats d'impression" #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rselements msgid "Elements:" msgstr "" @@ -551,11 +570,11 @@ msgid "Font..." msgstr "" #: vpsr.rsformatlbl -msgid "Format:" +msgid "Template:" msgstr "" #: vpsr.rsformats -msgid "Formats:" +msgid "Templates:" msgstr "" #: vpsr.rsfriday @@ -859,7 +878,7 @@ msgid "none" msgstr "" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" +msgid "Please supply a template name" msgstr "" #: vpsr.rsnoprintformats @@ -1112,8 +1131,15 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "&Imprimer" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rsprintformatdesigner -msgid "Print format designer" +msgid "Print template designer" msgstr "" #: vpsr.rsprintorder @@ -1227,18 +1253,22 @@ msgid "Save file..." msgstr "" #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" +msgid "Save print template to file?" msgstr "" #: vpsr.rssaveformatchangestofilename #, object-pascal-format -msgid "Save format to \"%s\"?" +msgid "Save print template to \"%s\"?" msgstr "" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "" @@ -1403,7 +1433,7 @@ msgid "Tuesday" msgstr "Mardi" #: vpsr.rsunabletoopen -#, fuzzy, object-pascal-format +#, object-pascal-format, fuzzy, badformat #| msgid "Error: Unable to open " msgid "Error: Unable to open %s" msgstr "Erreur: Incapable d'ouvrir" @@ -1713,7 +1743,7 @@ msgid "Invalid XML Character found" msgstr "Caractère XML non valide trouvé" #: vpsr.sinvalidxmlversion -#, fuzzy, object-pascal-format +#, object-pascal-format, fuzzy, badformat msgid "XMLPartner does not support XML specification greater than %s" msgstr "XMLPartner ne supporte pas la spécification XML supérieure à" @@ -1822,10 +1852,11 @@ msgid "End of input while looking for delimiter: " msgstr "Fin de l'entrée tout en recherchant delimiter:" #: vpsr.sunknownaxis -#, fuzzy, object-pascal-format +#, object-pascal-format, fuzzy, badformat msgid "Unknown axis specifier: %s" msgstr "Spécificateur d'axe inconnu" #: vpsr.sxmldecnotatbeg msgid "The XML declaration must appear before the first element" msgstr "La déclaration XML doit apparaître avant le premier élément" + diff --git a/components/tvplanit/languages/vpsr.nl.po b/components/tvplanit/languages/vpsr.nl.po index 954406858..afb1ef783 100644 --- a/components/tvplanit/languages/vpsr.nl.po +++ b/components/tvplanit/languages/vpsr.nl.po @@ -133,7 +133,9 @@ msgid "bottom line" msgstr "" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +#, fuzzy +#| msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "Webbrowser kan niet gestart worden. Controleer uw systeeminstellingen." #: vpsr.rsbrushcaption @@ -252,6 +254,10 @@ msgstr "Firma:" msgid "Completed on" msgstr "Voltooid op" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -425,6 +431,10 @@ msgstr "Omschrijving" msgid "Task" msgstr "Taak" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "" + #: vpsr.rsduedatelabel msgctxt "vpsr.rsduedatelabel" msgid "Due date:" @@ -443,7 +453,7 @@ msgid "Edit element" msgstr "" #: vpsr.rseditformatcaption -msgid "Edit format" +msgid "Edit template" msgstr "" #: vpsr.rseditingfolders @@ -455,13 +465,22 @@ msgid "Folder items editor." msgstr "Map Items Editor." #: vpsr.rseditprintformat -msgid "Edit Print Formats..." +#, fuzzy +#| msgid "Edit Print Formats..." +msgid "Edit Print Templates..." msgstr "Afdrukformaten bewerken..." #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rselements msgid "Elements:" msgstr "" @@ -545,11 +564,11 @@ msgid "Font..." msgstr "" #: vpsr.rsformatlbl -msgid "Format:" +msgid "Template:" msgstr "" #: vpsr.rsformats -msgid "Formats:" +msgid "Templates:" msgstr "" #: vpsr.rsfriday @@ -853,7 +872,7 @@ msgid "none" msgstr "" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" +msgid "Please supply a template name" msgstr "" #: vpsr.rsnoprintformats @@ -1106,8 +1125,15 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "&Printen" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rsprintformatdesigner -msgid "Print format designer" +msgid "Print template designer" msgstr "" #: vpsr.rsprintorder @@ -1221,18 +1247,22 @@ msgid "Save file..." msgstr "" #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" +msgid "Save print template to file?" msgstr "" #: vpsr.rssaveformatchangestofilename #, object-pascal-format -msgid "Save format to \"%s\"?" +msgid "Save print template to \"%s\"?" msgstr "" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "" diff --git a/components/tvplanit/languages/vpsr.pl.po b/components/tvplanit/languages/vpsr.pl.po index 7ffed478f..965fcfc89 100644 --- a/components/tvplanit/languages/vpsr.pl.po +++ b/components/tvplanit/languages/vpsr.pl.po @@ -133,7 +133,9 @@ msgid "bottom line" msgstr "dolna linia" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +#, fuzzy +#| msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "Nie udało się uruchomić przeglądarki WWW." #: vpsr.rsbrushcaption @@ -252,6 +254,10 @@ msgstr "Firma:" msgid "Completed on" msgstr "Zakończenie:" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -425,6 +431,10 @@ msgstr "Opis" msgid "Task" msgstr "Zadanie" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "" + #: vpsr.rsduedatelabel msgctxt "vpsr.rsduedatelabel" msgid "Due date:" @@ -443,7 +453,9 @@ msgid "Edit element" msgstr "Edytuj element" #: vpsr.rseditformatcaption -msgid "Edit format" +#, fuzzy +#| msgid "Edit format" +msgid "Edit template" msgstr "Format edycji" #: vpsr.rseditingfolders @@ -455,13 +467,22 @@ msgid "Folder items editor." msgstr "Edytor wartości." #: vpsr.rseditprintformat -msgid "Edit Print Formats..." +#, fuzzy +#| msgid "Edit Print Formats..." +msgid "Edit Print Templates..." msgstr "Edycja formatu wydruku..." #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "Edycja kształtu" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rselements msgid "Elements:" msgstr "Elementy:" @@ -545,11 +566,15 @@ msgid "Font..." msgstr "Czcionka..." #: vpsr.rsformatlbl -msgid "Format:" +#, fuzzy +#| msgid "Format:" +msgid "Template:" msgstr "Format:" #: vpsr.rsformats -msgid "Formats:" +#, fuzzy +#| msgid "Formats:" +msgid "Templates:" msgstr "Formaty:" #: vpsr.rsfriday @@ -855,7 +880,9 @@ msgid "none" msgstr "brak" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" +#, fuzzy +#| msgid "Please supply a format name" +msgid "Please supply a template name" msgstr "Proszę podać nazwę formatu" #: vpsr.rsnoprintformats @@ -1108,8 +1135,17 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "&Drukuj" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rsprintformatdesigner -msgid "Print format designer" +#, fuzzy +#| msgid "Print format designer" +msgid "Print template designer" msgstr "Ustawienia wydruku" #: vpsr.rsprintorder @@ -1223,18 +1259,25 @@ msgid "Save file..." msgstr "Zapisz plik..." #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" +#, fuzzy +#| msgid "Save format to file?" +msgid "Save print template to file?" msgstr "Zapisać dane do pliku?" #: vpsr.rssaveformatchangestofilename -#, object-pascal-format -msgid "Save format to \"%s\"?" +#, object-pascal-format, fuzzy +#| msgid "Save format to \"%s\"?" +msgid "Save print template to \"%s\"?" msgstr "Zapisać format do \"%s\"?" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "" diff --git a/components/tvplanit/languages/vpsr.pot b/components/tvplanit/languages/vpsr.pot index dca307526..de95a59f7 100644 --- a/components/tvplanit/languages/vpsr.pot +++ b/components/tvplanit/languages/vpsr.pot @@ -123,7 +123,7 @@ msgid "bottom line" msgstr "" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "" #: vpsr.rsbrushcaption @@ -242,6 +242,10 @@ msgstr "" msgid "Completed on" msgstr "" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -410,6 +414,10 @@ msgstr "" msgid "Task" msgstr "" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "" + #: vpsr.rsduedatelabel msgid "Due date:" msgstr "" @@ -427,7 +435,7 @@ msgid "Edit element" msgstr "" #: vpsr.rseditformatcaption -msgid "Edit format" +msgid "Edit template" msgstr "" #: vpsr.rseditingfolders @@ -439,13 +447,20 @@ msgid "Folder items editor." msgstr "" #: vpsr.rseditprintformat -msgid "Edit Print Formats..." +msgid "Edit Print Templates..." msgstr "" #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rselements msgid "Elements:" msgstr "" @@ -529,11 +544,11 @@ msgid "Font..." msgstr "" #: vpsr.rsformatlbl -msgid "Format:" +msgid "Template:" msgstr "" #: vpsr.rsformats -msgid "Formats:" +msgid "Templates:" msgstr "" #: vpsr.rsfriday @@ -835,7 +850,7 @@ msgid "none" msgstr "" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" +msgid "Please supply a template name" msgstr "" #: vpsr.rsnoprintformats @@ -1082,8 +1097,15 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rsprintformatdesigner -msgid "Print format designer" +msgid "Print template designer" msgstr "" #: vpsr.rsprintorder @@ -1197,18 +1219,22 @@ msgid "Save file..." msgstr "" #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" +msgid "Save print template to file?" msgstr "" #: vpsr.rssaveformatchangestofilename #, object-pascal-format -msgid "Save format to \"%s\"?" +msgid "Save print template to \"%s\"?" msgstr "" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "" diff --git a/components/tvplanit/languages/vpsr.ru.po b/components/tvplanit/languages/vpsr.ru.po index 0a0f64b0b..55c5ccb58 100644 --- a/components/tvplanit/languages/vpsr.ru.po +++ b/components/tvplanit/languages/vpsr.ru.po @@ -133,7 +133,9 @@ msgid "bottom line" msgstr "" #: vpsr.rsbrowsererror -msgid "Unable to start web browser. Make sure you have it properly setup on your system." +#, fuzzy +#| msgid "Unable to start web browser. Make sure you have it properly setup on your system." +msgid "Unable to start web browser. Make sure that it is propertly set up on your system." msgstr "Ошибка запуска браузер. Убедитесь в правильности настроек вашей системы." #: vpsr.rsbrushcaption @@ -252,6 +254,10 @@ msgstr "Компания:" msgid "Completed on" msgstr "Завершено на" +#: vpsr.rsconfirmation +msgid "Confirmation" +msgstr "" + #: vpsr.rsconfirmdeletecontact #, object-pascal-format msgid "Delete contact %s?" @@ -425,6 +431,10 @@ msgstr "Описание" msgid "Task" msgstr "Задача" +#: vpsr.rsdonotaskagain +msgid "Do not ask again." +msgstr "" + #: vpsr.rsduedatelabel msgctxt "vpsr.rsduedatelabel" msgid "Due date:" @@ -443,7 +453,9 @@ msgid "Edit element" msgstr "Изменить элемент" #: vpsr.rseditformatcaption -msgid "Edit format" +#, fuzzy +#| msgid "Edit format" +msgid "Edit template" msgstr "Изменить формат" #: vpsr.rseditingfolders @@ -455,13 +467,22 @@ msgid "Folder items editor." msgstr "Редактор элемента папки." #: vpsr.rseditprintformat -msgid "Edit Print Formats..." +#, fuzzy +#| msgid "Edit Print Formats..." +msgid "Edit Print Templates..." msgstr "Редактор формата печати..." #: vpsr.rseditshapecaption msgid "Edit shape" msgstr "" +#: vpsr.rselementalreadyexists +#, object-pascal-format +msgid "" +"An element named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rselements msgid "Elements:" msgstr "Элементы:" @@ -545,11 +566,13 @@ msgid "Font..." msgstr "Шрифт..." #: vpsr.rsformatlbl -msgid "Format:" +msgid "Template:" msgstr "" #: vpsr.rsformats -msgid "Formats:" +#, fuzzy +#| msgid "Formats:" +msgid "Templates:" msgstr "Форматы:" #: vpsr.rsfriday @@ -855,7 +878,7 @@ msgid "none" msgstr "" #: vpsr.rsnoprintformatname -msgid "Please supply a format name" +msgid "Please supply a template name" msgstr "" #: vpsr.rsnoprintformats @@ -1108,8 +1131,17 @@ msgctxt "vpsr.rsprintbtn" msgid "&Print" msgstr "Печать" +#: vpsr.rsprintformatalreadyexists +#, object-pascal-format +msgid "" +"A print template named %s already exists.\n" +"Please use a different name." +msgstr "" + #: vpsr.rsprintformatdesigner -msgid "Print format designer" +#, fuzzy +#| msgid "Print format designer" +msgid "Print template designer" msgstr "Редактор формата для печати" #: vpsr.rsprintorder @@ -1223,18 +1255,22 @@ msgid "Save file..." msgstr "Сохранить файл..." #: vpsr.rssaveformatchangestofile -msgid "Save format to file?" +msgid "Save print template to file?" msgstr "" #: vpsr.rssaveformatchangestofilename #, object-pascal-format -msgid "Save format to \"%s\"?" +msgid "Save print template to \"%s\"?" msgstr "" #: vpsr.rssaveicaltitle msgid "Export to iCal file" msgstr "" +#: vpsr.rssaveprintformat +msgid "Save print template" +msgstr "" + #: vpsr.rssavevcardtitle msgid "Export to vCard" msgstr "" diff --git a/components/tvplanit/source/design/vpprtfmted.pas b/components/tvplanit/source/design/vpprtfmted.pas index a994e5afe..30938e126 100644 --- a/components/tvplanit/source/design/vpprtfmted.pas +++ b/components/tvplanit/source/design/vpprtfmted.pas @@ -74,14 +74,15 @@ var frmPrtFmtEd : TVpPrtFmtEditor; {$IFDEF VERSION6} - procedure EditPrtFmts(Designer : TIDesigner; Link : TVpControlLink); +procedure EditPrtFmts(Designer: TIDesigner; Link: TVpControlLink); {$ELSE} - procedure EditPrtFmts(Designer : TIFormDesigner; Link : TVpControlLink); +procedure EditPrtFmts(Designer: TIFormDesigner; Link: TVpControlLink); {$ENDIF} begin frmPrtFmtEd := TVpPrtFmtEditor.Create(Application); frmPrtFmtEd.Designer := Designer; frmPrtFmtEd.ControlLink := Link; + frmPrtFmtEd.ShowSavePrompt := false; frmPrtFmtEd.Execute; if Assigned(Designer) then Designer.Modified; diff --git a/components/tvplanit/source/include/vpsr.inc b/components/tvplanit/source/include/vpsr.inc index 2f047cdc5..4dbfa7dd4 100644 --- a/components/tvplanit/source/include/vpsr.inc +++ b/components/tvplanit/source/include/vpsr.inc @@ -363,14 +363,19 @@ resourcestring RSTestDialog = 'Test dialog...'; { Print format list } - RSSaveFormatChangesToFile = 'Save format to file?'; - RSSaveFormatChangesToFilename = 'Save format to "%s"?'; + RSSaveFormatChangesToFile = 'Save print template to file?'; + RSSaveFormatChangesToFilename = 'Save print template to "%s"?'; + RSPrintFormatAlreadyExists = 'A print template named %s already exists.'#13#10'Please use a different name.'; + RSElementAlreadyExists = 'An element named %s already exists.'#13#10'Please use a different name.'; + RSConfirmation = 'Confirmation'; + RSSavePrintFormat = 'Save print template'; + RSDoNotAskAgain = 'Do not ask again.'; { Print Format Editor } - RSEditPrintFormat = 'Edit Print Formats...'; - RSPrintFormatDesigner = 'Print format designer'; - RSFormatLbl = 'Format:'; - RSFormats = 'Formats:'; + RSEditPrintFormat = 'Edit Print Templates...'; + RSPrintFormatDesigner = 'Print template designer'; + RSFormatLbl = 'Template:'; + RSFormats = 'Templates:'; RSElements = 'Elements:'; RSNewBtn = 'New'; RSEditBtn = 'Edit'; @@ -379,14 +384,14 @@ resourcestring RSNewFileBtn = 'New file'; RSLoadFileBtn = 'Load file...'; RSSaveFileBtn = 'Save file...'; - RSNoPrintFormatName = 'Please supply a format name'; + RSNoPrintFormatName = 'Please supply a template name'; RSNoDayIncrement = 'Day increment unit not specified.'; RSPleaseEnterFloat = 'Please enter a valid floating point value.'; RSReportSetup = 'Report setup'; { Print Format Item Editor } - RSEditFormatCaption = 'Edit format'; + RSEditFormatCaption = 'Edit template'; RSNameLbl = 'Name:'; RSDayIncLbl = 'Day increment:'; RSDayIncUnits = 'Day increment units'; @@ -439,14 +444,14 @@ resourcestring RSColorLbl = 'Color:'; { Automatic resource adding/selection} - RSAddNewResource = 'No resources have been defined. Would you ' + - 'like to add one now?'; - RSSelectResource = 'No resource has been selected. Would you ' + - 'like to select one now?'; + RSAddNewResource = 'No resources have been defined. ' + + 'Would you like to add one now?'; + RSSelectResource = 'No resource has been selected. ' + + 'Would you like to select one now?'; { AboutBox } - RSBrowserError = 'Unable to start web browser. Make sure you have ' + - 'it properly setup on your system.'; + RSBrowserError = 'Unable to start web browser. Make sure that it is ' + + 'propertly set up on your system.'; { Ini storage } RSIniFileStructure = 'Incorrect structure of ini file.'; diff --git a/components/tvplanit/source/vpcontactgrid.pas b/components/tvplanit/source/vpcontactgrid.pas index 5774a3852..4df61a25f 100644 --- a/components/tvplanit/source/vpcontactgrid.pas +++ b/components/tvplanit/source/vpcontactgrid.pas @@ -555,9 +555,7 @@ end; destructor TVpContactGrid.Destroy; begin - if (HandleAllocated) and (Assigned (DataStore)) and - (not (csDesigning in ComponentState)) - then + if HandleAllocated and Assigned(DataStore) and (not (csDesigning in ComponentState)) then DataStore.DeregisterWatcher(Handle); cgClickTimer.Free; diff --git a/components/tvplanit/source/vpedfmtlst.pas b/components/tvplanit/source/vpedfmtlst.pas index fc9d325b7..9c0ad6feb 100644 --- a/components/tvplanit/source/vpedfmtlst.pas +++ b/components/tvplanit/source/vpedfmtlst.pas @@ -109,6 +109,7 @@ type LastX, LastY: Integer; DragItem: Integer; FDrawingStyle: TVpDrawingStyle; + FShowSavePrompt: Boolean; procedure PositionControls; procedure SetCaptions; procedure SetDrawingStyle(const v: TVpDrawingStyle); @@ -137,6 +138,7 @@ type function Execute: Boolean; property ControlLink: TVpControlLink read FControlLink write SetControlLink; property DrawingStyle: TVpDrawingStyle read FDrawingStyle write SetDrawingStyle; + property ShowSavePrompt: Boolean read FShowSavePrompt write FShowSavePrompt; published property FormatFileName : string read FFormatFileName write SetFormatFileName; @@ -167,6 +169,7 @@ begin OpenDialog.InitialDir := ExtractFilePath(Application.ExeName); SaveDialog.InitialDir := ExtractFilePath(Application.ExeName); IsDirty := False; + FShowSavePrompt := true; FormatFileName := UnnamedFile; EnableFormatButtons(False); @@ -374,12 +377,26 @@ end; function TfrmPrnFormat.DirtyPrompt: Integer; var msg: String; + taskDlg: TTaskDialog; begin if FormatFileName = '' then msg := RSSaveFormatChangesToFile else msg := Format(RSSaveFormatChangesToFilename, [FormatFileName]); - Result := MessageDlg(msg, mtConfirmation, [mbYes, mbNo, mbCancel], 0); + + taskDlg := TTaskDialog.Create(self); + taskDlg.Text := msg; + taskDlg.Caption := RSConfirmation; + taskDlg.MainIcon := tdiQuestion; + taskDlg.Title := RSSavePrintFormat; + taskDlg.CommonButtons := [tcbYes, tcbNo, tcbCancel]; + taskDlg.VerificationText := RSDoNotAskAgain; + taskDlg.Execute; + FShowSavePrompt := not (tfVerificationFlagChecked in taskDlg.Flags); + Result := taskDlg.ModalResult; + taskDlg.Free; + + //Result := MessageDlg(msg, mtConfirmation, [mbYes, mbNo, mbCancel], 0); end; procedure TfrmPrnFormat.DoEditElement; @@ -451,9 +468,9 @@ begin Cancelled := not frmEditElement.Execute(E); if not Cancelled then begin - if lbElements.Items.IndexOf(E.ElementName) > -1 then begin - ShowMessage('An Element named ' + E.ElementName + ' already exists.' + - #13#10 + 'Please use another name.'); + if lbElements.Items.IndexOf(E.ElementName) > -1 then + begin + MessageDlg(SysUtils.Format(RSElementAlreadyExists, [E.ElementName]), mtError, [mbOK], 0); // Dump empty element Format.Elements.Items[E.Index].Free; Unique := False; @@ -468,7 +485,7 @@ begin end else // Dump empty element Format.Elements.Items[E.Index].Free; - // ...until element name is Unique or operation is cancelled + // ...until element name is unique or operation is cancelled until Unique or Cancelled; EnableElementButtons(true); @@ -512,8 +529,7 @@ begin if not Cancelled then begin if lbFormats.Items.IndexOf(AFormat.FormatName) > -1 then begin - ShowMessage('A format named ' + AFormat.FormatName + ' already exists.' + - #13#10 + 'Please use another name.'); + MessageDlg(Format(RSPrintFormatAlreadyExists, [AFormat.FormatName]), mtError, [mbOK], 0); // Dump empty format Prn.PrintFormats.Items[AFormat.Index].Free; Unique := False; @@ -547,7 +563,8 @@ begin SaveDialog.FileName := FormatFileName else SaveDialog.FileName := 'Unnamed.xml'; - if SaveDialog.Execute then begin + if SaveDialog.Execute then + begin FormatFileName := SaveDialog.FileName; ControlLink.Printer.SaveToFile(FormatFileName); IsDirty := False; @@ -582,7 +599,7 @@ procedure TfrmPrnFormat.FormCloseQuery(Sender: TObject; var CanClose: Boolean); begin CanClose := True; - if IsDirty then begin + if IsDirty and FShowSavePrompt then begin case DirtyPrompt of mrYes: DoSave; mrNo: ; @@ -799,7 +816,6 @@ begin Idx := Prn.Find(lbFormats.Items[lbFormats.ItemIndex]); if Idx > - 1 then Prn.CurFormat := Idx; - {Prn.CurFormat := lbFormats.ItemIndex; } end; Prn.NotifyLinked; EnableMoveButtons; diff --git a/components/tvplanit/source/vpprtfmt.pas b/components/tvplanit/source/vpprtfmt.pas index 443673421..c3e96d71a 100644 --- a/components/tvplanit/source/vpprtfmt.pas +++ b/components/tvplanit/source/vpprtfmt.pas @@ -2042,6 +2042,8 @@ begin FLastTask := StartTask; FLastContact := StartContact; + + // Render the page on the given canvas PaintToCanvasRect(ACanvas, ARect, ADate); // Set the return arguments. They will be needed for printing the next page. diff --git a/components/tvplanit/source/vpprtfmtdlg.pas b/components/tvplanit/source/vpprtfmtdlg.pas index 35f7ee95f..804dc3a3d 100644 --- a/components/tvplanit/source/vpprtfmtdlg.pas +++ b/components/tvplanit/source/vpprtfmtdlg.pas @@ -47,6 +47,7 @@ type private FControlLink: TVpControlLink; FDrawingStyle: TVpDrawingStyle; + FShowSavePrompt: Boolean; FWindowState: TWindowState; protected procedure Notification(AComponent: TComponent; Operation: TOperation); override; @@ -58,6 +59,7 @@ type published property ControlLink : TVpControlLink read FControlLink write SetControlLink; property DrawingStyle: TVpDrawingStyle read FDrawingStyle write FDrawingStyle default ds3d; + property ShowSavePrompt: Boolean read FShowSavePrompt write FShowSavePrompt default true; property WindowState : TWindowState read FWindowState write FWindowState default wsNormal; property Options; @@ -77,6 +79,7 @@ begin inherited Create(AOwner); FControlLink := SearchControlLink (Owner); FDrawingStyle := ds3d; + FShowSavePrompt := true; FPlacement.Height := 480; FPlacement.Width := 640; @@ -93,7 +96,9 @@ begin PrtFmtDlg.WindowState := WindowState; PrtFmtDlg.ControlLink := ControlLink; PrtFmtDlg.DrawingStyle := FDrawingStyle; + PrtFmtDlg.ShowSavePrompt := FShowSavePrompt; Result := PrtFmtDlg.Execute; + if Result then FShowSavePrompt := PrtFmtDlg.ShowSavePrompt; finally PrtFmtDlg.Free; end;