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

@@ -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"

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 ""

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 "Следующий день"

components/tvplanit/source/vpcontactgrid.pas

@@ -530,9 +530,8 @@ begin
       Str := FActiveContact.LastName;
 
     if Verify then
-      DoIt := (MessageDlg(RSDelete + ' ' + Str + ' ' + RSFromContactList
+      DoIt := (MessageDlg(Format(RSConfirmDeleteContact, [Str]) + #13#10#10 + RSPermanent,
-        + #13#10#10 + RSPermanent, mtconfirmation,
+        mtConfirmation, [mbYes, mbNo], 0) = mrYes);
-        [mbYes, mbNo], 0) = mrYes);
 
     if DoIt then begin
       FActiveContact.Deleted := true;

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(RSConfirmDeleteEvent + #13#10#10 + RSPermanent,
-//      DoIt := (MessageDlg(RSDelete + ' ' + Str + ' ' + RSFromSchedule + #13#10#10 + RSPermanent,
         mtConfirmation, [mbYes, mbNo], 0) = mrYes);
 
     if DoIt then begin

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...';

components/tvplanit/source/vptasklist.pas

@@ -577,9 +577,8 @@ begin
     Str := FActiveTask.Description;
 
     if Verify then
-      DoIt := (MessageDlg(RSDelete + ' ' + Str + ' ' + RSFromTaskList
+      DoIt := (MessageDlg(RSConfirmDeleteTask + #13#10#10 + RSPermanent,
-        + #13#10#10 + RSPermanent, mtconfirmation,
+        mtConfirmation, [mbYes, mbNo], 0) = mrYes);
-        [mbYes, mbNo], 0) = mrYes);
 
     if DoIt then begin
       FActiveTask.Deleted := true;