From 2b22eefdca101b873093d2e9f3d37f3bc374dd8b Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Fri, 24 Jun 2016 21:55:47 +0000 Subject: [PATCH] tvplanit: Fix delete confirmation messages. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4831 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/tvplanit/languages/vpsr.de.po | 25 ++++++++++---------- components/tvplanit/languages/vpsr.po | 25 ++++++++++---------- components/tvplanit/languages/vpsr.ru.po | 25 ++++++++++---------- components/tvplanit/source/vpcontactgrid.pas | 5 ++-- components/tvplanit/source/vpdayview.pas | 3 +-- components/tvplanit/source/vpsr.inc | 6 ++--- components/tvplanit/source/vptasklist.pas | 9 ++++--- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/components/tvplanit/languages/vpsr.de.po b/components/tvplanit/languages/vpsr.de.po index 2ef46ad59..390d7f6cb 100644 --- a/components/tvplanit/languages/vpsr.de.po +++ b/components/tvplanit/languages/vpsr.de.po @@ -222,6 +222,19 @@ msgstr "Firma:" msgid "Completed on" msgstr "Fertiggestellt am" +#: vpsr.rsconfirmdeletecontact +msgid "Delete contact %s?" +msgstr "Kontakt %s löschen?" + +#: vpsr.rsconfirmdeleteevent +msgctxt "vpsr.rsconfirmdeleteevent" +msgid "Delete event from schedule?" +msgstr "Ereignis aus dem Kalender löschen?" + +#: vpsr.rsconfirmdeletetask +msgid "Delete this task from your list?" +msgstr "Diese Aufgabe von Ihrer Liste löschen?" + #: vpsr.rscontactpopupadd msgid "Add Contact..." msgstr "Kontakt hinzufügen..." @@ -366,10 +379,6 @@ msgstr "Standard-Klang verwenden" msgid "Delete" msgstr "Löschen" -#: vpsr.rsdeletecontactfromschedule -msgid "Delete contact %s from your schedule?" -msgstr "Kontakt %s aus Ihrem Terminplan löschen?" - #: vpsr.rsdescriptionlbl msgctxt "vpsr.rsdescriptionlbl" msgid "Subject:" @@ -466,18 +475,10 @@ msgstr "F" msgid "Friday" msgstr "Freitag" -#: vpsr.rsfromcontactlist -msgid "from your list of contacts?" -msgstr "Von Ihrer Kontaktliste?" - #: vpsr.rsfromschedule msgid "from your schedule?" msgstr "Von Ihrem Zeitplan?" -#: vpsr.rsfromtasklist -msgid "from your task list?" -msgstr "Von Ihrer Aufgabenliste?" - #: vpsr.rshintnextday msgid "Next day" msgstr "Nächster Tag" diff --git a/components/tvplanit/languages/vpsr.po b/components/tvplanit/languages/vpsr.po index ea983f722..affdadc3a 100644 --- a/components/tvplanit/languages/vpsr.po +++ b/components/tvplanit/languages/vpsr.po @@ -212,6 +212,19 @@ msgstr "" msgid "Completed on" msgstr "" +#: vpsr.rsconfirmdeletecontact +msgid "Delete contact %s?" +msgstr "" + +#: vpsr.rsconfirmdeleteevent +msgctxt "vpsr.rsconfirmdeleteevent" +msgid "Delete event from schedule?" +msgstr "" + +#: vpsr.rsconfirmdeletetask +msgid "Delete this task from your list?" +msgstr "" + #: vpsr.rscontactpopupadd msgid "Add Contact..." msgstr "" @@ -356,10 +369,6 @@ msgstr "" msgid "Delete" msgstr "" -#: vpsr.rsdeletecontactfromschedule -msgid "Delete contact %s from your schedule?" -msgstr "" - #: vpsr.rsdescriptionlbl msgctxt "vpsr.rsdescriptionlbl" msgid "Subject:" @@ -456,18 +465,10 @@ msgstr "" msgid "Friday" msgstr "" -#: vpsr.rsfromcontactlist -msgid "from your list of contacts?" -msgstr "" - #: vpsr.rsfromschedule msgid "from your schedule?" msgstr "" -#: vpsr.rsfromtasklist -msgid "from your task list?" -msgstr "" - #: vpsr.rshintnextday msgid "Next day" msgstr "" diff --git a/components/tvplanit/languages/vpsr.ru.po b/components/tvplanit/languages/vpsr.ru.po index 88594cc35..f87cb9498 100644 --- a/components/tvplanit/languages/vpsr.ru.po +++ b/components/tvplanit/languages/vpsr.ru.po @@ -222,6 +222,19 @@ msgstr "Компания:" msgid "Completed on" msgstr "Завершено на" +#: vpsr.rsconfirmdeletecontact +msgid "Delete contact %s?" +msgstr "" + +#: vpsr.rsconfirmdeleteevent +msgctxt "vpsr.rsconfirmdeleteevent" +msgid "Delete event from schedule?" +msgstr "" + +#: vpsr.rsconfirmdeletetask +msgid "Delete this task from your list?" +msgstr "" + #: vpsr.rscontactpopupadd msgid "Add Contact..." msgstr "Добавить контакт..." @@ -366,10 +379,6 @@ msgstr "Использовать звук по умолчанию" msgid "Delete" msgstr "Удалить" -#: vpsr.rsdeletecontactfromschedule -msgid "Delete contact %s from your schedule?" -msgstr "Удалить контакт %s из вашего расписания?" - #: vpsr.rsdescriptionlbl msgctxt "vpsr.rsdescriptionlbl" msgid "Subject:" @@ -466,18 +475,10 @@ msgstr "" msgid "Friday" msgstr "Пятница" -#: vpsr.rsfromcontactlist -msgid "from your list of contacts?" -msgstr "из вашего списка контактов?" - #: vpsr.rsfromschedule msgid "from your schedule?" msgstr "из вашего расписания?" -#: vpsr.rsfromtasklist -msgid "from your task list?" -msgstr "из вашего списка задач?" - #: vpsr.rshintnextday msgid "Next day" msgstr "Следующий день" diff --git a/components/tvplanit/source/vpcontactgrid.pas b/components/tvplanit/source/vpcontactgrid.pas index 9de14a8b7..24524b6f0 100644 --- a/components/tvplanit/source/vpcontactgrid.pas +++ b/components/tvplanit/source/vpcontactgrid.pas @@ -530,9 +530,8 @@ begin Str := FActiveContact.LastName; if Verify then - DoIt := (MessageDlg(RSDelete + ' ' + Str + ' ' + RSFromContactList - + #13#10#10 + RSPermanent, mtconfirmation, - [mbYes, mbNo], 0) = mrYes); + DoIt := (MessageDlg(Format(RSConfirmDeleteContact, [Str]) + #13#10#10 + RSPermanent, + mtConfirmation, [mbYes, mbNo], 0) = mrYes); if DoIt then begin FActiveContact.Deleted := true; diff --git a/components/tvplanit/source/vpdayview.pas b/components/tvplanit/source/vpdayview.pas index 9bd313e6d..30ddfe114 100644 --- a/components/tvplanit/source/vpdayview.pas +++ b/components/tvplanit/source/vpdayview.pas @@ -849,8 +849,7 @@ begin Str := '"' + FActiveEvent.Description + '"'; if Verify then - DoIt := (MessageDlg(Format(RSDeleteContactFromSchedule, [Str]) + #13#10#10 + RSPermanent, -// DoIt := (MessageDlg(RSDelete + ' ' + Str + ' ' + RSFromSchedule + #13#10#10 + RSPermanent, + DoIt := (MessageDlg(RSConfirmDeleteEvent + #13#10#10 + RSPermanent, mtConfirmation, [mbYes, mbNo], 0) = mrYes); if DoIt then begin diff --git a/components/tvplanit/source/vpsr.inc b/components/tvplanit/source/vpsr.inc index 775aea487..2f24c1c66 100644 --- a/components/tvplanit/source/vpsr.inc +++ b/components/tvplanit/source/vpsr.inc @@ -129,17 +129,17 @@ resourcestring RSPermanent = 'This operation cannot be undone!'; {Contact Specific} - RSFromContactList = 'from your list of contacts?'; RSContactPopupAdd = 'Add Contact...'; RSContactPopupEdit = 'Edit Contact...'; RSContactPopupDelete = 'Delete Contact...'; + RSConfirmDeleteContact = 'Delete contact %s?'; {Event Specific} RSFromSchedule = 'from your schedule?'; - RSDeleteContactFromSchedule = 'Delete contact %s from your schedule?'; + RSConfirmDeleteEvent = 'Delete event from schedule?'; {Task Specific} - RSFromTaskList = 'from your task list?'; + RSConfirmDeleteTask = 'Delete this task from your list?'; RSTaskPopupAdd = 'Add Task...'; RSTaskPopupEdit = 'Edit Task...'; RSTaskPopupDelete = 'Delete Task...'; diff --git a/components/tvplanit/source/vptasklist.pas b/components/tvplanit/source/vptasklist.pas index 8fc7a02bd..d2283293c 100644 --- a/components/tvplanit/source/vptasklist.pas +++ b/components/tvplanit/source/vptasklist.pas @@ -577,9 +577,8 @@ begin Str := FActiveTask.Description; if Verify then - DoIt := (MessageDlg(RSDelete + ' ' + Str + ' ' + RSFromTaskList - + #13#10#10 + RSPermanent, mtconfirmation, - [mbYes, mbNo], 0) = mrYes); + DoIt := (MessageDlg(RSConfirmDeleteTask + #13#10#10 + RSPermanent, + mtConfirmation, [mbYes, mbNo], 0) = mrYes); if DoIt then begin FActiveTask.Deleted := true; @@ -1425,7 +1424,7 @@ begin Exit; if FActiveTask <> nil then begin Repaint; - DeleteActiveTask (True); + DeleteActiveTask(True); end; end; {=====} @@ -1437,7 +1436,7 @@ begin if FActiveTask <> nil then begin Repaint; { edit this Task } - tlSpawnTaskEditDialog (False); + tlSpawnTaskEditDialog(False); end; end; {=====}