From 1f82493afa51680e654174ab216c49498561eb9f Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 10 Sep 2016 20:08:06 +0000 Subject: [PATCH] tvplanit: Add brush pattern to resource group. Remove duplicate resourcestrings. Clearer context menus by adding divider lines. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5148 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../tvplanit/examples/fulldemo/demomain.pas | 3 +- components/tvplanit/languages/vpsr.de.po | 324 +++++------------- components/tvplanit/languages/vpsr.fr.po | 321 +++++------------ components/tvplanit/languages/vpsr.nl.po | 315 +++++------------ components/tvplanit/languages/vpsr.po | 309 +++++------------ components/tvplanit/languages/vpsr.ru.po | 316 +++++------------ components/tvplanit/source/vpcalendar.pas | 30 +- components/tvplanit/source/vpdata.pas | 14 + components/tvplanit/source/vpdayview.pas | 74 ++-- .../tvplanit/source/vpdayviewpainter.pas | 2 +- components/tvplanit/source/vpmisc.pas | 6 + components/tvplanit/source/vpmonthview.pas | 28 +- components/tvplanit/source/vpsr.inc | 122 ++++--- components/tvplanit/source/vpweekview.pas | 40 ++- 14 files changed, 622 insertions(+), 1282 deletions(-) diff --git a/components/tvplanit/examples/fulldemo/demomain.pas b/components/tvplanit/examples/fulldemo/demomain.pas index b3f27ad71..044af045c 100644 --- a/components/tvplanit/examples/fulldemo/demomain.pas +++ b/components/tvplanit/examples/fulldemo/demomain.pas @@ -412,11 +412,12 @@ begin datastore := VpControlLink1.Datastore; grp := datastore.Resources.AddResourceGroup('Res2 overlayed', [1, 2]); grp.ReadOnly := true; + grp.Pattern := opDiagCross; if datastore.Resource <> nil then datastore.Resource.Group := grp else datastore.Resource.Group := nil; // Important: This is not called internally so far! - datastore.RefreshEvents; + datastore.RefreshEvents; // or: datastore.UpdateGroupEvents; end; procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean); diff --git a/components/tvplanit/languages/vpsr.de.po b/components/tvplanit/languages/vpsr.de.po index c2185579d..40dfab429 100644 --- a/components/tvplanit/languages/vpsr.de.po +++ b/components/tvplanit/languages/vpsr.de.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" #: vpsr.rs1day msgid "1 day" @@ -119,66 +119,16 @@ msgstr "Füllung" msgid "Calendar" msgstr "Kalender" -#: vpsr.rscalendarnextmonth -msgctxt "vpsr.rscalendarnextmonth" -msgid "Next Month" -msgstr "Nächster Monat" - -#: vpsr.rscalendarnextyear -msgctxt "vpsr.rscalendarnextyear" -msgid "Next Year" -msgstr "Nächstes Jahr" - -#: vpsr.rscalendarpopupnextmonth -msgctxt "vpsr.rscalendarpopupnextmonth" -msgid "Next Month" -msgstr "Nächster Monat" - -#: vpsr.rscalendarpopupnextyear -msgctxt "vpsr.rscalendarpopupnextyear" -msgid "Next Year" -msgstr "Nächstes Jahr" - -#: vpsr.rscalendarpopupprevmonth -msgctxt "vpsr.rscalendarpopupprevmonth" -msgid "Previous Month" -msgstr "Voriger Monat" - -#: vpsr.rscalendarpopupprevyear -msgctxt "vpsr.rscalendarpopupprevyear" -msgid "Previous Year" -msgstr "Voriges Jahr" - #: vpsr.rscalendarpopuprevert msgctxt "vpsr.rscalendarpopuprevert" msgid "Revert" msgstr "Zurück" -#: vpsr.rscalendarpopuptoday -msgctxt "vpsr.rscalendarpopuptoday" -msgid "Today" -msgstr "Heute" - -#: vpsr.rscalendarprevmonth -msgctxt "vpsr.rscalendarprevmonth" -msgid "Previous Month" -msgstr "Voriger Monat" - -#: vpsr.rscalendarprevyear -msgctxt "vpsr.rscalendarprevyear" -msgid "Previous Year" -msgstr "Voriges Jahr" - #: vpsr.rscalendarrevert msgctxt "vpsr.rscalendarrevert" msgid "Revert" msgstr "Zurück" -#: vpsr.rscalendartoday -msgctxt "vpsr.rscalendartoday" -msgid "Today" -msgstr "Heute" - #: vpsr.rscalendarweekabbr msgid "CW" msgstr "KW" @@ -190,7 +140,7 @@ msgstr "Abbrechen" #: vpsr.rscannoteditoverlayedevent msgid "Cannot edit this overlayed event." -msgstr "" +msgstr "Dieses überlagerte Ereignis kann nicht bearbeitet werden." #: vpsr.rscaption msgctxt "vpsr.rscaption" @@ -274,15 +224,15 @@ msgid "Delete this task from your list?" msgstr "Diese Aufgabe von Ihrer Liste löschen?" #: vpsr.rscontactpopupadd -msgid "Add Contact..." +msgid "Add contact..." msgstr "Kontakt hinzufügen..." #: vpsr.rscontactpopupdelete -msgid "Delete Contact..." +msgid "Delete contact..." msgstr "Kontakt löschen..." #: vpsr.rscontactpopupedit -msgid "Edit Contact..." +msgid "Edit contact..." msgstr "Kontakt bearbeiten..." #: vpsr.rscontactselement @@ -331,76 +281,23 @@ msgstr "Fehler: Tag wird benötigt" #: vpsr.rsdaypopupadd msgctxt "vpsr.rsdaypopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "Ereignis hinzufügen..." #: vpsr.rsdaypopupdelete -msgid "Delete Event..." +msgid "Delete event..." msgstr "Ereignis löschen..." #: vpsr.rsdaypopupedit msgctxt "vpsr.rsdaypopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Ereignis bearbeiten..." #: vpsr.rsdaypopupnav msgctxt "vpsr.rsdaypopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Datum ändern" -#: vpsr.rsdaypopupnavnextday -msgid "Next Day" -msgstr "Nächster Tag" - -#: vpsr.rsdaypopupnavnextmonth -msgctxt "vpsr.rsdaypopupnavnextmonth" -msgid "Next Month" -msgstr "Nächster Monat" - -#: vpsr.rsdaypopupnavnextweek -msgctxt "vpsr.rsdaypopupnavnextweek" -msgid "Next Week" -msgstr "Nächste Woche" - -#: vpsr.rsdaypopupnavnextyear -msgctxt "vpsr.rsdaypopupnavnextyear" -msgid "Next Year" -msgstr "Nächstes Jahr" - -#: vpsr.rsdaypopupnavprevday -msgid "Previous Day" -msgstr "Voriger Tag" - -#: vpsr.rsdaypopupnavprevmonth -msgctxt "vpsr.rsdaypopupnavprevmonth" -msgid "Previous Month" -msgstr "Voriger Monat" - -#: vpsr.rsdaypopupnavprevweek -msgctxt "vpsr.rsdaypopupnavprevweek" -msgid "Previous Week" -msgstr "Vorige Woche" - -#: vpsr.rsdaypopupnavprevyear -msgctxt "vpsr.rsdaypopupnavprevyear" -msgid "Previous Year" -msgstr "Voriges Jahr" - -#: vpsr.rsdaypopupnavtoday -msgctxt "vpsr.rsdaypopupnavtoday" -msgid "Today" -msgstr "Heute" - -#: vpsr.rsdaypopupnavtomorrow -msgctxt "vpsr.rsdaypopupnavtomorrow" -msgid "Tomorrow" -msgstr "Morgen" - -#: vpsr.rsdaypopupnavyesterday -msgctxt "vpsr.rsdaypopupnavyesterday" -msgid "Yesterday" -msgstr "Gestern" - #: vpsr.rsdays msgid "Days" msgstr "Tage" @@ -471,7 +368,7 @@ msgid "Due Date:" msgstr "Fälligkeitsdatum:" #: vpsr.rsduplicateresource -msgid "Error: Duplicate Resource." +msgid "Error: Duplicate resource." msgstr "Fehler: Doppelte Ressource." #: vpsr.rseditbtn @@ -487,11 +384,11 @@ msgid "Edit format" msgstr "Format bearbeiten" #: vpsr.rseditingfolders -msgid "Folder Editor." +msgid "Folder editor." msgstr "Ordner-Editor" #: vpsr.rseditingitems -msgid "Folder Items Editor." +msgid "Folder items editor." msgstr "Editor für Ordner-Einträge" #: vpsr.rseditprintformat @@ -575,39 +472,6 @@ msgstr "Von Ihrem Zeitplan?" msgid "Height" msgstr "Höhe" -#: vpsr.rshintnextday -msgid "Next day" -msgstr "Nächster Tag" - -#: vpsr.rshintnextweek -msgctxt "vpsr.rshintnextweek" -msgid "Next week" -msgstr "Nächste Woche" - -#: vpsr.rshintprevday -msgid "Previous day" -msgstr "Voriger Tag" - -#: vpsr.rshintprevweek -msgctxt "vpsr.rshintprevweek" -msgid "Previous week" -msgstr "Vorige Woche" - -#: vpsr.rshinttoday -msgctxt "vpsr.rshinttoday" -msgid "Today" -msgstr "Heute" - -#: vpsr.rshinttomorrow -msgctxt "vpsr.rshinttomorrow" -msgid "Tomorrow" -msgstr "Morgen" - -#: vpsr.rshintyesterday -msgctxt "vpsr.rshintyesterday" -msgid "Yesterday" -msgstr "Gestern" - #: vpsr.rshours msgid "Hours" msgstr "Stunden" @@ -625,27 +489,27 @@ msgid "Interval (days):" msgstr "Intervall (Tage):" #: vpsr.rsinvaliddate -msgid "Error: Invalid Date." +msgid "Error: Invalid date." msgstr "Fehler: Ungültiges Datum." #: vpsr.rsinvalidday -msgid "Error: Invalid Day." +msgid "Error: Invalid day." msgstr "Fehler: Ungültiger Tag." #: vpsr.rsinvalidmonth -msgid "Error: Invalid Month." -msgstr "Fehler: Ungültiger Monat." +msgid "Error: Invalid month." +msgstr "Fehler: Ungültiger Monat" #: vpsr.rsinvalidmonthname -msgid "Error: Invalid Month Name." -msgstr "Fehler: Ungültiger Monatsname." +msgid "Error: Invalid month name." +msgstr "Fehler: Ungültiger Monatsname" #: vpsr.rsinvalidtablespecified msgid "Error: Invalid table specified." msgstr "Fehler: Ungültige Tabelle angegeben." #: vpsr.rsinvalidyear -msgid "Error: Invalid Year." +msgid "Error: Invalid year." msgstr "Fehler: Ungültiges Jahr" #: vpsr.rslastnamelbl @@ -730,37 +594,12 @@ msgid "Error: Month Is Required." msgstr "Fehler: Monat ist erforderlich." #: vpsr.rsmonthlybydate -msgid "Monthly By Date" -msgstr "Monat, nach Datum" +msgid "Monthly by date" +msgstr "Monatlich, nach Datum" #: vpsr.rsmonthlybyday -msgid "Monthly By Day" -msgstr "Monat, nach Tag" - -#: vpsr.rsmonthpopupnextmonth -msgctxt "vpsr.rsmonthpopupnextmonth" -msgid "Next Month" -msgstr "Nächster Monat" - -#: vpsr.rsmonthpopupnextyear -msgctxt "vpsr.rsmonthpopupnextyear" -msgid "Next Year" -msgstr "Nächstes Jahr" - -#: vpsr.rsmonthpopupprevmonth -msgctxt "vpsr.rsmonthpopupprevmonth" -msgid "Previous Month" -msgstr "Voriger Monat" - -#: vpsr.rsmonthpopupprevyear -msgctxt "vpsr.rsmonthpopupprevyear" -msgid "Previous Year" -msgstr "Voriges Jahr" - -#: vpsr.rsmonthpopuptoday -msgctxt "vpsr.rsmonthpopuptoday" -msgid "Today" -msgstr "Heute" +msgid "Monthly by day" +msgstr "Monatlich, nach Tag" #: vpsr.rsmonths msgid "Months" @@ -794,6 +633,24 @@ msgstr "Neu" msgid "New file" msgstr "Neue Datei" +#: vpsr.rsnextday +msgctxt "vpsr.rsnextday" +msgid "Next day" +msgstr "Nächster Tag" + +#: vpsr.rsnextmonth +msgid "Next month" +msgstr "Nächster Monat" + +#: vpsr.rsnextweek +msgctxt "vpsr.rsnextweek" +msgid "Next week" +msgstr "Nächste Woche" + +#: vpsr.rsnextyear +msgid "Next year" +msgstr "Nächstes Jahr" + #: vpsr.rsno msgid "N" msgstr "N" @@ -889,7 +746,7 @@ msgid "Assistant" msgstr "Assistent" #: vpsr.rsphonetypelabel10 -msgid "Other Fax" +msgid "Other fax" msgstr "Anderes Fax" #: vpsr.rsphonetypelabel11 @@ -917,7 +774,7 @@ msgid "Work" msgstr "Arbeit" #: vpsr.rsphonetypelabel17 -msgid "Work Fax" +msgid "Work fax" msgstr "Fax in Arbeit" #: vpsr.rsphonetypelabel2 @@ -938,7 +795,7 @@ msgid "Home" msgstr "Zuhause" #: vpsr.rsphonetypelabel6 -msgid "Home Fax" +msgid "Home fax" msgstr "Fax zuhause" #: vpsr.rsphonetypelabel7 @@ -960,7 +817,7 @@ msgstr "Pixel" #: vpsr.rspopupresourcegroups msgid "Overlay events" -msgstr "" +msgstr "Ereignisse überlagern" #: vpsr.rsposition msgid "Position" @@ -970,6 +827,24 @@ msgstr "Position" msgid "Position:" msgstr "Position" +#: vpsr.rsprevday +msgctxt "vpsr.rsprevday" +msgid "Previous day" +msgstr "Voriger Tag" + +#: vpsr.rsprevmonth +msgid "Previous month" +msgstr "Voriger Monat" + +#: vpsr.rsprevweek +msgctxt "vpsr.rsprevweek" +msgid "Previous week" +msgstr "Vorige Woche" + +#: vpsr.rsprevyear +msgid "Previous year" +msgstr "Voriges Jahr" + #: vpsr.rsprintbtn msgctxt "vpsr.rsprintbtn" msgid "&Print" @@ -1146,15 +1021,15 @@ msgid "Task complete" msgstr "Aufgabe fertiggestellt" #: vpsr.rstaskpopupadd -msgid "Add Task..." +msgid "Add task..." msgstr "Aufgabe hinzufügen..." #: vpsr.rstaskpopupdelete -msgid "Delete Task..." +msgid "Delete task..." msgstr "Aufgabe löschen..." #: vpsr.rstaskpopupedit -msgid "Edit Task..." +msgid "Edit task..." msgstr "Aufgabe bearbeiten..." #: vpsr.rstaskselement @@ -1162,11 +1037,11 @@ msgid "Tasks" msgstr "Aufgaben" #: vpsr.rstasktitlenoresource -msgid "Task List" +msgid "Task list" msgstr "Aufgabenliste" #: vpsr.rstasktitleresource -msgid "Task List - " +msgid "Task list - " msgstr "Aufgabenliste - " #: vpsr.rstextcaption @@ -1201,6 +1076,16 @@ msgstr "Titel:" msgid "top-left to bottom-right line" msgstr "Linie von links oben nach rechts unten" +#: vpsr.rstoday +msgctxt "vpsr.rstoday" +msgid "Today" +msgstr "Heute" + +#: vpsr.rstomorrow +msgctxt "vpsr.rstomorrow" +msgid "Tomorrow" +msgstr "Morgen" + #: vpsr.rstop msgid "Top" msgstr "Oben" @@ -1248,58 +1133,23 @@ msgstr "Woche mit" #: vpsr.rsweekpopupadd msgctxt "vpsr.rsweekpopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "Ereignis hinzufügen..." #: vpsr.rsweekpopupdelete -msgid "&Delete Event..." +msgid "&Delete event..." msgstr "Ereignis löschen..." #: vpsr.rsweekpopupedit msgctxt "vpsr.rsweekpopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Ereignis bearbeiten..." #: vpsr.rsweekpopupnav msgctxt "vpsr.rsweekpopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Datum ändern" -#: vpsr.rsweekpopupnavnextmonth -msgctxt "vpsr.rsweekpopupnavnextmonth" -msgid "Next Month" -msgstr "Nächsten Monat" - -#: vpsr.rsweekpopupnavnextweek -msgctxt "vpsr.rsweekpopupnavnextweek" -msgid "Next Week" -msgstr "Nächste Woche" - -#: vpsr.rsweekpopupnavnextyear -msgctxt "vpsr.rsweekpopupnavnextyear" -msgid "Next Year" -msgstr "Nächstes Jahr" - -#: vpsr.rsweekpopupnavprevmonth -msgctxt "vpsr.rsweekpopupnavprevmonth" -msgid "Previous Month" -msgstr "Voriger Monat" - -#: vpsr.rsweekpopupnavprevweek -msgctxt "vpsr.rsweekpopupnavprevweek" -msgid "Previous Week" -msgstr "Vorige Woche" - -#: vpsr.rsweekpopupnavprevyear -msgctxt "vpsr.rsweekpopupnavprevyear" -msgid "Previous Year" -msgstr "Voriges Jahr" - -#: vpsr.rsweekpopupnavtoday -msgctxt "vpsr.rsweekpopupnavtoday" -msgid "Today" -msgstr "Heute" - #: vpsr.rsweeks msgid "Weeks" msgstr "Wochen" @@ -1333,11 +1183,11 @@ msgid "Error: Year is required." msgstr "Fehler: Jahr wird benötigt" #: vpsr.rsyearlybydate -msgid "Yearly By Date" +msgid "Yearly by date" msgstr "Jährlich, nach Datum" #: vpsr.rsyearlybyday -msgid "Yearly By Day" +msgid "Yearly by day" msgstr "Jährlich, nach Wochentag" #: vpsr.rsyears @@ -1348,6 +1198,11 @@ msgstr "Jahre" msgid "Y" msgstr "Y" +#: vpsr.rsyesterday +msgctxt "vpsr.rsyesterday" +msgid "Yesterday" +msgstr "Gestern" + #: vpsr.rszipcodelbl msgid "Zip code:" msgstr "Postleitzahl:" @@ -1635,4 +1490,3 @@ msgstr "Unbekannte Achsen-Spezifikation: %s" #: vpsr.sxmldecnotatbeg msgid "The XML declaration must appear before the first element" msgstr "Die XML-Deklaration muss vor dem ersten Element erscheinen." - diff --git a/components/tvplanit/languages/vpsr.fr.po b/components/tvplanit/languages/vpsr.fr.po index a39ede3c0..81ab54240 100644 --- a/components/tvplanit/languages/vpsr.fr.po +++ b/components/tvplanit/languages/vpsr.fr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2016-08-28 01:36+0100\n" +"PO-Revision-Date: 2016-09-10 21:58+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr_FR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Eazy Po 0.9.5.3\n" +"X-Generator: Poedit 1.8.9\n" #: vpsr.rs1day msgid "1 day" @@ -125,66 +125,16 @@ msgstr "" msgid "Calendar" msgstr "" -#: vpsr.rscalendarnextmonth -msgctxt "vpsr.rscalendarnextmonth" -msgid "Next Month" -msgstr "Mois prochain" - -#: vpsr.rscalendarnextyear -msgctxt "vpsr.rscalendarnextyear" -msgid "Next Year" -msgstr "Année prochain" - -#: vpsr.rscalendarpopupnextmonth -msgctxt "vpsr.rscalendarpopupnextmonth" -msgid "Next Month" -msgstr "Mois prochain" - -#: vpsr.rscalendarpopupnextyear -msgctxt "vpsr.rscalendarpopupnextyear" -msgid "Next Year" -msgstr "Année prochain" - -#: vpsr.rscalendarpopupprevmonth -msgctxt "vpsr.rscalendarpopupprevmonth" -msgid "Previous Month" -msgstr "Mois dernière" - -#: vpsr.rscalendarpopupprevyear -msgctxt "vpsr.rscalendarpopupprevyear" -msgid "Previous Year" -msgstr "Année dernière" - #: vpsr.rscalendarpopuprevert msgctxt "vpsr.rscalendarpopuprevert" msgid "Revert" msgstr "Revenir en arrière" -#: vpsr.rscalendarpopuptoday -msgctxt "vpsr.rscalendarpopuptoday" -msgid "Today" -msgstr "Aujourd'hui" - -#: vpsr.rscalendarprevmonth -msgctxt "vpsr.rscalendarprevmonth" -msgid "Previous Month" -msgstr "Mois dernière" - -#: vpsr.rscalendarprevyear -msgctxt "vpsr.rscalendarprevyear" -msgid "Previous Year" -msgstr "Année dernière" - #: vpsr.rscalendarrevert msgctxt "vpsr.rscalendarrevert" msgid "Revert" msgstr "Revenir en arrière" -#: vpsr.rscalendartoday -msgctxt "vpsr.rscalendartoday" -msgid "Today" -msgstr "Aujourd'hui" - #: vpsr.rscalendarweekabbr msgid "CW" msgstr "" @@ -280,15 +230,15 @@ msgid "Delete this task from your list?" msgstr "Supprimer la tache de votre liste?" #: vpsr.rscontactpopupadd -msgid "Add Contact..." +msgid "Add contact..." msgstr "Ajouter un contact..." #: vpsr.rscontactpopupdelete -msgid "Delete Contact..." +msgid "Delete contact..." msgstr "Supprimer un contact..." #: vpsr.rscontactpopupedit -msgid "Edit Contact..." +msgid "Edit contact..." msgstr "Modifier un contact..." #: vpsr.rscontactselement @@ -337,76 +287,23 @@ msgstr "Erreur: Il faut choisir un jour" #: vpsr.rsdaypopupadd msgctxt "vpsr.rsdaypopupadd" -msgid "Add Event..." -msgstr "Ajouter un événement" +msgid "Add event..." +msgstr "Ajouter un événement..." #: vpsr.rsdaypopupdelete -msgid "Delete Event..." -msgstr "Supprimer un événement" +msgid "Delete event..." +msgstr "Supprimer un événement..." #: vpsr.rsdaypopupedit msgctxt "vpsr.rsdaypopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Modifier un événement" #: vpsr.rsdaypopupnav msgctxt "vpsr.rsdaypopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Changez la date" -#: vpsr.rsdaypopupnavnextday -msgid "Next Day" -msgstr "Jour suivant" - -#: vpsr.rsdaypopupnavnextmonth -msgctxt "vpsr.rsdaypopupnavnextmonth" -msgid "Next Month" -msgstr "Mois prochain" - -#: vpsr.rsdaypopupnavnextweek -msgctxt "vpsr.rsdaypopupnavnextweek" -msgid "Next Week" -msgstr "Semaine prochaine" - -#: vpsr.rsdaypopupnavnextyear -msgctxt "vpsr.rsdaypopupnavnextyear" -msgid "Next Year" -msgstr "Année prochaine" - -#: vpsr.rsdaypopupnavprevday -msgid "Previous Day" -msgstr "Jour précedent" - -#: vpsr.rsdaypopupnavprevmonth -msgctxt "vpsr.rsdaypopupnavprevmonth" -msgid "Previous Month" -msgstr "Mois dernière" - -#: vpsr.rsdaypopupnavprevweek -msgctxt "vpsr.rsdaypopupnavprevweek" -msgid "Previous Week" -msgstr "Semaine dernière" - -#: vpsr.rsdaypopupnavprevyear -msgctxt "vpsr.rsdaypopupnavprevyear" -msgid "Previous Year" -msgstr "Année dernière" - -#: vpsr.rsdaypopupnavtoday -msgctxt "vpsr.rsdaypopupnavtoday" -msgid "Today" -msgstr "Aujourd'hui" - -#: vpsr.rsdaypopupnavtomorrow -msgctxt "vpsr.rsdaypopupnavtomorrow" -msgid "Tomorrow" -msgstr "Demain" - -#: vpsr.rsdaypopupnavyesterday -msgctxt "vpsr.rsdaypopupnavyesterday" -msgid "Yesterday" -msgstr "Hier" - #: vpsr.rsdays msgid "Days" msgstr "Jours" @@ -429,14 +326,11 @@ msgid "Delete" msgstr "Supprimer" #: vpsr.rsdeletebtn -#, fuzzy msgctxt "vpsr.rsdeletebtn" msgid "Delete" msgstr "Supprimer" #: vpsr.rsdescriptionlbl -#, fuzzy -#| msgid "Subject:" msgctxt "vpsr.rsdescriptionlbl" msgid "Description:" msgstr "Sujet:" @@ -480,7 +374,7 @@ msgid "Due Date:" msgstr "Date d'échéance:" #: vpsr.rsduplicateresource -msgid "Error: Duplicate Resource." +msgid "Error: Duplicate resource." msgstr "Erreur: ressource en doublon" #: vpsr.rseditbtn @@ -496,11 +390,11 @@ msgid "Edit format" msgstr "" #: vpsr.rseditingfolders -msgid "Folder Editor." +msgid "Folder editor." msgstr "Editeur de dossier." #: vpsr.rseditingitems -msgid "Folder Items Editor." +msgid "Folder items editor." msgstr "Editeur d'éléments de dossier" #: vpsr.rseditprintformat @@ -584,39 +478,6 @@ msgstr "de votre agenda?" msgid "Height" msgstr "" -#: vpsr.rshintnextday -msgid "Next day" -msgstr "Jour suivant" - -#: vpsr.rshintnextweek -msgctxt "vpsr.rshintnextweek" -msgid "Next week" -msgstr "Semaine prochaine" - -#: vpsr.rshintprevday -msgid "Previous day" -msgstr "Jour précédent" - -#: vpsr.rshintprevweek -msgctxt "vpsr.rshintprevweek" -msgid "Previous week" -msgstr "Semaine précédent" - -#: vpsr.rshinttoday -msgctxt "vpsr.rshinttoday" -msgid "Today" -msgstr "Aujourd'hui" - -#: vpsr.rshinttomorrow -msgctxt "vpsr.rshinttomorrow" -msgid "Tomorrow" -msgstr "Demain" - -#: vpsr.rshintyesterday -msgctxt "vpsr.rshintyesterday" -msgid "Yesterday" -msgstr "Hier" - #: vpsr.rshours msgid "Hours" msgstr "Heures" @@ -634,19 +495,19 @@ msgid "Interval (days):" msgstr "Intervale (en jours)" #: vpsr.rsinvaliddate -msgid "Error: Invalid Date." +msgid "Error: Invalid date." msgstr "Erreur: date non valide" #: vpsr.rsinvalidday -msgid "Error: Invalid Day." +msgid "Error: Invalid day." msgstr "Erreur: jour non valide" #: vpsr.rsinvalidmonth -msgid "Error: Invalid Month." +msgid "Error: Invalid month." msgstr "Erreur: mois non valide" #: vpsr.rsinvalidmonthname -msgid "Error: Invalid Month Name." +msgid "Error: Invalid month name." msgstr "Erreur: nom du mois non valide" #: vpsr.rsinvalidtablespecified @@ -654,7 +515,7 @@ msgid "Error: Invalid table specified." msgstr "Erreur: table non valide specifié" #: vpsr.rsinvalidyear -msgid "Error: Invalid Year." +msgid "Error: Invalid year." msgstr "Erreur: année non valide" #: vpsr.rslastnamelbl @@ -739,38 +600,13 @@ msgid "Error: Month Is Required." msgstr "Erreur: le mois est obligatoire" #: vpsr.rsmonthlybydate -msgid "Monthly By Date" +msgid "Monthly by date" msgstr "Mensuel par date" #: vpsr.rsmonthlybyday -msgid "Monthly By Day" +msgid "Monthly by day" msgstr "Mensuel par jour" -#: vpsr.rsmonthpopupnextmonth -msgctxt "vpsr.rsmonthpopupnextmonth" -msgid "Next Month" -msgstr "Mois suivant" - -#: vpsr.rsmonthpopupnextyear -msgctxt "vpsr.rsmonthpopupnextyear" -msgid "Next Year" -msgstr "Année suivante" - -#: vpsr.rsmonthpopupprevmonth -msgctxt "vpsr.rsmonthpopupprevmonth" -msgid "Previous Month" -msgstr "Mois précédent" - -#: vpsr.rsmonthpopupprevyear -msgctxt "vpsr.rsmonthpopupprevyear" -msgid "Previous Year" -msgstr "Année précedent" - -#: vpsr.rsmonthpopuptoday -msgctxt "vpsr.rsmonthpopuptoday" -msgid "Today" -msgstr "Aujourd'hui" - #: vpsr.rsmonths msgid "Months" msgstr "" @@ -803,6 +639,24 @@ msgstr "" msgid "New file" msgstr "" +#: vpsr.rsnextday +msgctxt "vpsr.rsnextday" +msgid "Next day" +msgstr "Jour suivant" + +#: vpsr.rsnextmonth +msgid "Next month" +msgstr "" + +#: vpsr.rsnextweek +msgctxt "vpsr.rsnextweek" +msgid "Next week" +msgstr "Semaine prochaine" + +#: vpsr.rsnextyear +msgid "Next year" +msgstr "" + #: vpsr.rsno msgid "N" msgstr "" @@ -898,7 +752,7 @@ msgid "Assistant" msgstr "Assistante" #: vpsr.rsphonetypelabel10 -msgid "Other Fax" +msgid "Other fax" msgstr "Autre fax" #: vpsr.rsphonetypelabel11 @@ -926,7 +780,7 @@ msgid "Work" msgstr "Travail" #: vpsr.rsphonetypelabel17 -msgid "Work Fax" +msgid "Work fax" msgstr "Fax (Travail)" #: vpsr.rsphonetypelabel2 @@ -947,7 +801,7 @@ msgid "Home" msgstr "Maison" #: vpsr.rsphonetypelabel6 -msgid "Home Fax" +msgid "Home fax" msgstr "Fax (Maison)" #: vpsr.rsphonetypelabel7 @@ -979,6 +833,24 @@ msgstr "Position" msgid "Position:" msgstr "Position:" +#: vpsr.rsprevday +msgctxt "vpsr.rsprevday" +msgid "Previous day" +msgstr "Jour précédent" + +#: vpsr.rsprevmonth +msgid "Previous month" +msgstr "" + +#: vpsr.rsprevweek +msgctxt "vpsr.rsprevweek" +msgid "Previous week" +msgstr "Semaine précédent" + +#: vpsr.rsprevyear +msgid "Previous year" +msgstr "" + #: vpsr.rsprintbtn msgctxt "vpsr.rsprintbtn" msgid "&Print" @@ -1155,15 +1027,15 @@ msgid "Task complete" msgstr "Tache terminé" #: vpsr.rstaskpopupadd -msgid "Add Task..." +msgid "Add task..." msgstr "Ajouter un tâche..." #: vpsr.rstaskpopupdelete -msgid "Delete Task..." +msgid "Delete task..." msgstr "Supprimer un tâche..." #: vpsr.rstaskpopupedit -msgid "Edit Task..." +msgid "Edit task..." msgstr "Modifier un tâche..." #: vpsr.rstaskselement @@ -1171,11 +1043,11 @@ msgid "Tasks" msgstr "" #: vpsr.rstasktitlenoresource -msgid "Task List" +msgid "Task list" msgstr "Liste des tâches" #: vpsr.rstasktitleresource -msgid "Task List - " +msgid "Task list - " msgstr "Liste des tâches -" #: vpsr.rstextcaption @@ -1210,6 +1082,16 @@ msgstr "Titre:" msgid "top-left to bottom-right line" msgstr "" +#: vpsr.rstoday +msgctxt "vpsr.rstoday" +msgid "Today" +msgstr "Aujourd'hui" + +#: vpsr.rstomorrow +msgctxt "vpsr.rstomorrow" +msgid "Tomorrow" +msgstr "Demain" + #: vpsr.rstop msgid "Top" msgstr "" @@ -1257,58 +1139,23 @@ msgstr "Semaine du" #: vpsr.rsweekpopupadd msgctxt "vpsr.rsweekpopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "Ajouter un événement..." #: vpsr.rsweekpopupdelete -msgid "&Delete Event..." +msgid "&Delete event..." msgstr "&Supprimer un événement..." #: vpsr.rsweekpopupedit msgctxt "vpsr.rsweekpopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Modifier un événement..." #: vpsr.rsweekpopupnav msgctxt "vpsr.rsweekpopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Changer la date" -#: vpsr.rsweekpopupnavnextmonth -msgctxt "vpsr.rsweekpopupnavnextmonth" -msgid "Next Month" -msgstr "Mois prochain" - -#: vpsr.rsweekpopupnavnextweek -msgctxt "vpsr.rsweekpopupnavnextweek" -msgid "Next Week" -msgstr "Semaine prochaine" - -#: vpsr.rsweekpopupnavnextyear -msgctxt "vpsr.rsweekpopupnavnextyear" -msgid "Next Year" -msgstr "Année prochain" - -#: vpsr.rsweekpopupnavprevmonth -msgctxt "vpsr.rsweekpopupnavprevmonth" -msgid "Previous Month" -msgstr "Mois précédent" - -#: vpsr.rsweekpopupnavprevweek -msgctxt "vpsr.rsweekpopupnavprevweek" -msgid "Previous Week" -msgstr "Semaine précédente" - -#: vpsr.rsweekpopupnavprevyear -msgctxt "vpsr.rsweekpopupnavprevyear" -msgid "Previous Year" -msgstr "Année précédente" - -#: vpsr.rsweekpopupnavtoday -msgctxt "vpsr.rsweekpopupnavtoday" -msgid "Today" -msgstr "Aujourd'hui" - #: vpsr.rsweeks msgid "Weeks" msgstr "" @@ -1342,11 +1189,11 @@ msgid "Error: Year is required." msgstr "Erreur: l'année est obligatoire" #: vpsr.rsyearlybydate -msgid "Yearly By Date" +msgid "Yearly by date" msgstr "Annuel par date" #: vpsr.rsyearlybyday -msgid "Yearly By Day" +msgid "Yearly by day" msgstr "Annuel par jour" #: vpsr.rsyears @@ -1357,6 +1204,11 @@ msgstr "" msgid "Y" msgstr "" +#: vpsr.rsyesterday +msgctxt "vpsr.rsyesterday" +msgid "Yesterday" +msgstr "Hier" + #: vpsr.rszipcodelbl msgid "Zip code:" msgstr "Code postal:" @@ -1644,4 +1496,3 @@ 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 753229210..149da9760 100644 --- a/components/tvplanit/languages/vpsr.nl.po +++ b/components/tvplanit/languages/vpsr.nl.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" #: vpsr.rs1day msgid "1 day" @@ -119,66 +119,16 @@ msgstr "" msgid "Calendar" msgstr "" -#: vpsr.rscalendarnextmonth -msgctxt "vpsr.rscalendarnextmonth" -msgid "Next Month" -msgstr "Volgende Maand" - -#: vpsr.rscalendarnextyear -msgctxt "vpsr.rscalendarnextyear" -msgid "Next Year" -msgstr "Volgende Jaar" - -#: vpsr.rscalendarpopupnextmonth -msgctxt "vpsr.rscalendarpopupnextmonth" -msgid "Next Month" -msgstr "Volgende Maand" - -#: vpsr.rscalendarpopupnextyear -msgctxt "vpsr.rscalendarpopupnextyear" -msgid "Next Year" -msgstr "Volgende Jaar" - -#: vpsr.rscalendarpopupprevmonth -msgctxt "vpsr.rscalendarpopupprevmonth" -msgid "Previous Month" -msgstr "Vorige Maand" - -#: vpsr.rscalendarpopupprevyear -msgctxt "vpsr.rscalendarpopupprevyear" -msgid "Previous Year" -msgstr "Vorige Jaar" - #: vpsr.rscalendarpopuprevert msgctxt "vpsr.rscalendarpopuprevert" msgid "Revert" msgstr "Terug" -#: vpsr.rscalendarpopuptoday -msgctxt "vpsr.rscalendarpopuptoday" -msgid "Today" -msgstr "Vandaag" - -#: vpsr.rscalendarprevmonth -msgctxt "vpsr.rscalendarprevmonth" -msgid "Previous Month" -msgstr "Vorige Maand" - -#: vpsr.rscalendarprevyear -msgctxt "vpsr.rscalendarprevyear" -msgid "Previous Year" -msgstr "Vorig Jaar" - #: vpsr.rscalendarrevert msgctxt "vpsr.rscalendarrevert" msgid "Revert" msgstr "Terug" -#: vpsr.rscalendartoday -msgctxt "vpsr.rscalendartoday" -msgid "Today" -msgstr "Vandaag" - #: vpsr.rscalendarweekabbr msgid "CW" msgstr "KW" @@ -274,15 +224,15 @@ msgid "Delete this task from your list?" msgstr "Deze taak uit de lijst wissen?" #: vpsr.rscontactpopupadd -msgid "Add Contact..." +msgid "Add contact..." msgstr "Contact toevoegen..." #: vpsr.rscontactpopupdelete -msgid "Delete Contact..." +msgid "Delete contact..." msgstr "Contact wissen..." #: vpsr.rscontactpopupedit -msgid "Edit Contact..." +msgid "Edit contact..." msgstr "Contact bewerken..." #: vpsr.rscontactselement @@ -331,76 +281,23 @@ msgstr "Fout: Dag is verplicht" #: vpsr.rsdaypopupadd msgctxt "vpsr.rsdaypopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "Gebeurtenis toevoegen..." #: vpsr.rsdaypopupdelete -msgid "Delete Event..." +msgid "Delete event..." msgstr "Gebeurtenis wissen..." #: vpsr.rsdaypopupedit msgctxt "vpsr.rsdaypopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Gebeurtenis bewerken..." #: vpsr.rsdaypopupnav msgctxt "vpsr.rsdaypopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Datum wijzigen" -#: vpsr.rsdaypopupnavnextday -msgid "Next Day" -msgstr "Volgende Dag" - -#: vpsr.rsdaypopupnavnextmonth -msgctxt "vpsr.rsdaypopupnavnextmonth" -msgid "Next Month" -msgstr "Volgende Maand" - -#: vpsr.rsdaypopupnavnextweek -msgctxt "vpsr.rsdaypopupnavnextweek" -msgid "Next Week" -msgstr "Volgende Week" - -#: vpsr.rsdaypopupnavnextyear -msgctxt "vpsr.rsdaypopupnavnextyear" -msgid "Next Year" -msgstr "Volgende Jaar" - -#: vpsr.rsdaypopupnavprevday -msgid "Previous Day" -msgstr "Vorige Dag" - -#: vpsr.rsdaypopupnavprevmonth -msgctxt "vpsr.rsdaypopupnavprevmonth" -msgid "Previous Month" -msgstr "Vorige Maand" - -#: vpsr.rsdaypopupnavprevweek -msgctxt "vpsr.rsdaypopupnavprevweek" -msgid "Previous Week" -msgstr "Vorige Week" - -#: vpsr.rsdaypopupnavprevyear -msgctxt "vpsr.rsdaypopupnavprevyear" -msgid "Previous Year" -msgstr "Vorige Jaar" - -#: vpsr.rsdaypopupnavtoday -msgctxt "vpsr.rsdaypopupnavtoday" -msgid "Today" -msgstr "Vandaag" - -#: vpsr.rsdaypopupnavtomorrow -msgctxt "vpsr.rsdaypopupnavtomorrow" -msgid "Tomorrow" -msgstr "Morgen" - -#: vpsr.rsdaypopupnavyesterday -msgctxt "vpsr.rsdaypopupnavyesterday" -msgid "Yesterday" -msgstr "Gisteren" - #: vpsr.rsdays msgid "Days" msgstr "Dagen" @@ -423,14 +320,11 @@ msgid "Delete" msgstr "Wissen" #: vpsr.rsdeletebtn -#, fuzzy msgctxt "vpsr.rsdeletebtn" msgid "Delete" msgstr "Wissen" #: vpsr.rsdescriptionlbl -#, fuzzy -#| msgid "Subject:" msgctxt "vpsr.rsdescriptionlbl" msgid "Description:" msgstr "Onderwerp:" @@ -474,7 +368,7 @@ msgid "Due Date:" msgstr "Vervaldatum:" #: vpsr.rsduplicateresource -msgid "Error: Duplicate Resource." +msgid "Error: Duplicate resource." msgstr "Fout: Duplicaat Hulpmiddel." #: vpsr.rseditbtn @@ -490,11 +384,11 @@ msgid "Edit format" msgstr "" #: vpsr.rseditingfolders -msgid "Folder Editor." +msgid "Folder editor." msgstr "Map Editor." #: vpsr.rseditingitems -msgid "Folder Items Editor." +msgid "Folder items editor." msgstr "Map Items Editor." #: vpsr.rseditprintformat @@ -578,39 +472,6 @@ msgstr "van uw tijdschema?" msgid "Height" msgstr "" -#: vpsr.rshintnextday -msgid "Next day" -msgstr "Volgende dag" - -#: vpsr.rshintnextweek -msgctxt "vpsr.rshintnextweek" -msgid "Next week" -msgstr "Volgende week" - -#: vpsr.rshintprevday -msgid "Previous day" -msgstr "Vorige dag" - -#: vpsr.rshintprevweek -msgctxt "vpsr.rshintprevweek" -msgid "Previous week" -msgstr "Vorige week" - -#: vpsr.rshinttoday -msgctxt "vpsr.rshinttoday" -msgid "Today" -msgstr "Vandaag" - -#: vpsr.rshinttomorrow -msgctxt "vpsr.rshinttomorrow" -msgid "Tomorrow" -msgstr "Morgen" - -#: vpsr.rshintyesterday -msgctxt "vpsr.rshintyesterday" -msgid "Yesterday" -msgstr "Gisteren" - #: vpsr.rshours msgid "Hours" msgstr "Uren" @@ -628,19 +489,19 @@ msgid "Interval (days):" msgstr "Interval (dagen):" #: vpsr.rsinvaliddate -msgid "Error: Invalid Date." +msgid "Error: Invalid date." msgstr "Fout: Ongeldige Datum." #: vpsr.rsinvalidday -msgid "Error: Invalid Day." +msgid "Error: Invalid day." msgstr "Fout: Ongeldige Dag." #: vpsr.rsinvalidmonth -msgid "Error: Invalid Month." +msgid "Error: Invalid month." msgstr "Fout: Omgeldige Maand." #: vpsr.rsinvalidmonthname -msgid "Error: Invalid Month Name." +msgid "Error: Invalid month name." msgstr "Fout: Ongeldige Maandnaam." #: vpsr.rsinvalidtablespecified @@ -648,7 +509,7 @@ msgid "Error: Invalid table specified." msgstr "Fout: Ongeldige tabel opgegeven." #: vpsr.rsinvalidyear -msgid "Error: Invalid Year." +msgid "Error: Invalid year." msgstr "Fout: Ongeldig Jaar." #: vpsr.rslastnamelbl @@ -733,38 +594,13 @@ msgid "Error: Month Is Required." msgstr "Fout: Maand is verplicht." #: vpsr.rsmonthlybydate -msgid "Monthly By Date" +msgid "Monthly by date" msgstr "Maandelijks, op Datum" #: vpsr.rsmonthlybyday -msgid "Monthly By Day" +msgid "Monthly by day" msgstr "Maandelijks, op Dag" -#: vpsr.rsmonthpopupnextmonth -msgctxt "vpsr.rsmonthpopupnextmonth" -msgid "Next Month" -msgstr "Volgende Maand" - -#: vpsr.rsmonthpopupnextyear -msgctxt "vpsr.rsmonthpopupnextyear" -msgid "Next Year" -msgstr "Volgende Jaar" - -#: vpsr.rsmonthpopupprevmonth -msgctxt "vpsr.rsmonthpopupprevmonth" -msgid "Previous Month" -msgstr "Vorige Maand" - -#: vpsr.rsmonthpopupprevyear -msgctxt "vpsr.rsmonthpopupprevyear" -msgid "Previous Year" -msgstr "Vorige Jaar" - -#: vpsr.rsmonthpopuptoday -msgctxt "vpsr.rsmonthpopuptoday" -msgid "Today" -msgstr "Vandaag" - #: vpsr.rsmonths msgid "Months" msgstr "" @@ -797,6 +633,24 @@ msgstr "" msgid "New file" msgstr "" +#: vpsr.rsnextday +msgctxt "vpsr.rsnextday" +msgid "Next day" +msgstr "Volgende dag" + +#: vpsr.rsnextmonth +msgid "Next month" +msgstr "" + +#: vpsr.rsnextweek +msgctxt "vpsr.rsnextweek" +msgid "Next week" +msgstr "Volgende week" + +#: vpsr.rsnextyear +msgid "Next year" +msgstr "" + #: vpsr.rsno msgid "N" msgstr "N" @@ -892,7 +746,7 @@ msgid "Assistant" msgstr "Assistent" #: vpsr.rsphonetypelabel10 -msgid "Other Fax" +msgid "Other fax" msgstr "Andere Fax" #: vpsr.rsphonetypelabel11 @@ -920,7 +774,7 @@ msgid "Work" msgstr "Werk" #: vpsr.rsphonetypelabel17 -msgid "Work Fax" +msgid "Work fax" msgstr "Werk Fax" #: vpsr.rsphonetypelabel2 @@ -941,7 +795,7 @@ msgid "Home" msgstr "Thuis" #: vpsr.rsphonetypelabel6 -msgid "Home Fax" +msgid "Home fax" msgstr "Thuis Fax" #: vpsr.rsphonetypelabel7 @@ -973,6 +827,24 @@ msgstr "Positie" msgid "Position:" msgstr "Positie:" +#: vpsr.rsprevday +msgctxt "vpsr.rsprevday" +msgid "Previous day" +msgstr "Vorige dag" + +#: vpsr.rsprevmonth +msgid "Previous month" +msgstr "" + +#: vpsr.rsprevweek +msgctxt "vpsr.rsprevweek" +msgid "Previous week" +msgstr "Vorige week" + +#: vpsr.rsprevyear +msgid "Previous year" +msgstr "" + #: vpsr.rsprintbtn msgctxt "vpsr.rsprintbtn" msgid "&Print" @@ -1149,15 +1021,15 @@ msgid "Task complete" msgstr "Taak afgerond" #: vpsr.rstaskpopupadd -msgid "Add Task..." +msgid "Add task..." msgstr "Taak toevoegen..." #: vpsr.rstaskpopupdelete -msgid "Delete Task..." +msgid "Delete task..." msgstr "Taak wissen..." #: vpsr.rstaskpopupedit -msgid "Edit Task..." +msgid "Edit task..." msgstr "Taak bewerken..." #: vpsr.rstaskselement @@ -1165,11 +1037,11 @@ msgid "Tasks" msgstr "" #: vpsr.rstasktitlenoresource -msgid "Task List" +msgid "Task list" msgstr "Taaklijst" #: vpsr.rstasktitleresource -msgid "Task List - " +msgid "Task list - " msgstr "Taaklijst - " #: vpsr.rstextcaption @@ -1204,6 +1076,16 @@ msgstr "Titel:" msgid "top-left to bottom-right line" msgstr "" +#: vpsr.rstoday +msgctxt "vpsr.rstoday" +msgid "Today" +msgstr "Vandaag" + +#: vpsr.rstomorrow +msgctxt "vpsr.rstomorrow" +msgid "Tomorrow" +msgstr "Morgen" + #: vpsr.rstop msgid "Top" msgstr "" @@ -1251,58 +1133,23 @@ msgstr "Week van" #: vpsr.rsweekpopupadd msgctxt "vpsr.rsweekpopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "Gebeurtenis toevoegen..." #: vpsr.rsweekpopupdelete -msgid "&Delete Event..." +msgid "&Delete event..." msgstr "Gebeurtenis wissen..." #: vpsr.rsweekpopupedit msgctxt "vpsr.rsweekpopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Gebeurtenis bewerken..." #: vpsr.rsweekpopupnav msgctxt "vpsr.rsweekpopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Datum wijzigen" -#: vpsr.rsweekpopupnavnextmonth -msgctxt "vpsr.rsweekpopupnavnextmonth" -msgid "Next Month" -msgstr "Volgende Maand" - -#: vpsr.rsweekpopupnavnextweek -msgctxt "vpsr.rsweekpopupnavnextweek" -msgid "Next Week" -msgstr "Volgende Week" - -#: vpsr.rsweekpopupnavnextyear -msgctxt "vpsr.rsweekpopupnavnextyear" -msgid "Next Year" -msgstr "Volgende Jaar" - -#: vpsr.rsweekpopupnavprevmonth -msgctxt "vpsr.rsweekpopupnavprevmonth" -msgid "Previous Month" -msgstr "Vorige Maand" - -#: vpsr.rsweekpopupnavprevweek -msgctxt "vpsr.rsweekpopupnavprevweek" -msgid "Previous Week" -msgstr "Vorige Week" - -#: vpsr.rsweekpopupnavprevyear -msgctxt "vpsr.rsweekpopupnavprevyear" -msgid "Previous Year" -msgstr "Vorige Jaar" - -#: vpsr.rsweekpopupnavtoday -msgctxt "vpsr.rsweekpopupnavtoday" -msgid "Today" -msgstr "Vandaag" - #: vpsr.rsweeks msgid "Weeks" msgstr "" @@ -1336,11 +1183,11 @@ msgid "Error: Year is required." msgstr "Fout: Jaar is verplicht." #: vpsr.rsyearlybydate -msgid "Yearly By Date" +msgid "Yearly by date" msgstr "Jaarlijks, op Datum" #: vpsr.rsyearlybyday -msgid "Yearly By Day" +msgid "Yearly by day" msgstr "Jaarlijks, op dag" #: vpsr.rsyears @@ -1351,6 +1198,11 @@ msgstr "" msgid "Y" msgstr "Y" +#: vpsr.rsyesterday +msgctxt "vpsr.rsyesterday" +msgid "Yesterday" +msgstr "Gisteren" + #: vpsr.rszipcodelbl msgid "Zip code:" msgstr "Postkode:" @@ -1638,4 +1490,3 @@ msgstr "Onbekende as specificatie: %s" #: vpsr.sxmldecnotatbeg msgid "The XML declaration must appear before the first element" msgstr "De XML declaratie moet voor het eerste element staan" - diff --git a/components/tvplanit/languages/vpsr.po b/components/tvplanit/languages/vpsr.po index 8febe563c..5385094a2 100644 --- a/components/tvplanit/languages/vpsr.po +++ b/components/tvplanit/languages/vpsr.po @@ -109,66 +109,16 @@ msgstr "" msgid "Calendar" msgstr "" -#: vpsr.rscalendarnextmonth -msgctxt "vpsr.rscalendarnextmonth" -msgid "Next Month" -msgstr "" - -#: vpsr.rscalendarnextyear -msgctxt "vpsr.rscalendarnextyear" -msgid "Next Year" -msgstr "" - -#: vpsr.rscalendarpopupnextmonth -msgctxt "vpsr.rscalendarpopupnextmonth" -msgid "Next Month" -msgstr "" - -#: vpsr.rscalendarpopupnextyear -msgctxt "vpsr.rscalendarpopupnextyear" -msgid "Next Year" -msgstr "" - -#: vpsr.rscalendarpopupprevmonth -msgctxt "vpsr.rscalendarpopupprevmonth" -msgid "Previous Month" -msgstr "" - -#: vpsr.rscalendarpopupprevyear -msgctxt "vpsr.rscalendarpopupprevyear" -msgid "Previous Year" -msgstr "" - #: vpsr.rscalendarpopuprevert msgctxt "vpsr.rscalendarpopuprevert" msgid "Revert" msgstr "" -#: vpsr.rscalendarpopuptoday -msgctxt "vpsr.rscalendarpopuptoday" -msgid "Today" -msgstr "" - -#: vpsr.rscalendarprevmonth -msgctxt "vpsr.rscalendarprevmonth" -msgid "Previous Month" -msgstr "" - -#: vpsr.rscalendarprevyear -msgctxt "vpsr.rscalendarprevyear" -msgid "Previous Year" -msgstr "" - #: vpsr.rscalendarrevert msgctxt "vpsr.rscalendarrevert" msgid "Revert" msgstr "" -#: vpsr.rscalendartoday -msgctxt "vpsr.rscalendartoday" -msgid "Today" -msgstr "" - #: vpsr.rscalendarweekabbr msgid "CW" msgstr "" @@ -264,15 +214,15 @@ msgid "Delete this task from your list?" msgstr "" #: vpsr.rscontactpopupadd -msgid "Add Contact..." +msgid "Add contact..." msgstr "" #: vpsr.rscontactpopupdelete -msgid "Delete Contact..." +msgid "Delete contact..." msgstr "" #: vpsr.rscontactpopupedit -msgid "Edit Contact..." +msgid "Edit contact..." msgstr "" #: vpsr.rscontactselement @@ -321,74 +271,21 @@ msgstr "" #: vpsr.rsdaypopupadd msgctxt "vpsr.rsdaypopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "" #: vpsr.rsdaypopupdelete -msgid "Delete Event..." +msgid "Delete event..." msgstr "" #: vpsr.rsdaypopupedit msgctxt "vpsr.rsdaypopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "" #: vpsr.rsdaypopupnav msgctxt "vpsr.rsdaypopupnav" -msgid "Change Date" -msgstr "" - -#: vpsr.rsdaypopupnavnextday -msgid "Next Day" -msgstr "" - -#: vpsr.rsdaypopupnavnextmonth -msgctxt "vpsr.rsdaypopupnavnextmonth" -msgid "Next Month" -msgstr "" - -#: vpsr.rsdaypopupnavnextweek -msgctxt "vpsr.rsdaypopupnavnextweek" -msgid "Next Week" -msgstr "" - -#: vpsr.rsdaypopupnavnextyear -msgctxt "vpsr.rsdaypopupnavnextyear" -msgid "Next Year" -msgstr "" - -#: vpsr.rsdaypopupnavprevday -msgid "Previous Day" -msgstr "" - -#: vpsr.rsdaypopupnavprevmonth -msgctxt "vpsr.rsdaypopupnavprevmonth" -msgid "Previous Month" -msgstr "" - -#: vpsr.rsdaypopupnavprevweek -msgctxt "vpsr.rsdaypopupnavprevweek" -msgid "Previous Week" -msgstr "" - -#: vpsr.rsdaypopupnavprevyear -msgctxt "vpsr.rsdaypopupnavprevyear" -msgid "Previous Year" -msgstr "" - -#: vpsr.rsdaypopupnavtoday -msgctxt "vpsr.rsdaypopupnavtoday" -msgid "Today" -msgstr "" - -#: vpsr.rsdaypopupnavtomorrow -msgctxt "vpsr.rsdaypopupnavtomorrow" -msgid "Tomorrow" -msgstr "" - -#: vpsr.rsdaypopupnavyesterday -msgctxt "vpsr.rsdaypopupnavyesterday" -msgid "Yesterday" +msgid "Change date" msgstr "" #: vpsr.rsdays @@ -461,7 +358,7 @@ msgid "Due Date:" msgstr "" #: vpsr.rsduplicateresource -msgid "Error: Duplicate Resource." +msgid "Error: Duplicate resource." msgstr "" #: vpsr.rseditbtn @@ -477,11 +374,11 @@ msgid "Edit format" msgstr "" #: vpsr.rseditingfolders -msgid "Folder Editor." +msgid "Folder editor." msgstr "" #: vpsr.rseditingitems -msgid "Folder Items Editor." +msgid "Folder items editor." msgstr "" #: vpsr.rseditprintformat @@ -565,39 +462,6 @@ msgstr "" msgid "Height" msgstr "" -#: vpsr.rshintnextday -msgid "Next day" -msgstr "" - -#: vpsr.rshintnextweek -msgctxt "vpsr.rshintnextweek" -msgid "Next week" -msgstr "" - -#: vpsr.rshintprevday -msgid "Previous day" -msgstr "" - -#: vpsr.rshintprevweek -msgctxt "vpsr.rshintprevweek" -msgid "Previous week" -msgstr "" - -#: vpsr.rshinttoday -msgctxt "vpsr.rshinttoday" -msgid "Today" -msgstr "" - -#: vpsr.rshinttomorrow -msgctxt "vpsr.rshinttomorrow" -msgid "Tomorrow" -msgstr "" - -#: vpsr.rshintyesterday -msgctxt "vpsr.rshintyesterday" -msgid "Yesterday" -msgstr "" - #: vpsr.rshours msgid "Hours" msgstr "" @@ -615,19 +479,19 @@ msgid "Interval (days):" msgstr "" #: vpsr.rsinvaliddate -msgid "Error: Invalid Date." +msgid "Error: Invalid date." msgstr "" #: vpsr.rsinvalidday -msgid "Error: Invalid Day." +msgid "Error: Invalid day." msgstr "" #: vpsr.rsinvalidmonth -msgid "Error: Invalid Month." +msgid "Error: Invalid month." msgstr "" #: vpsr.rsinvalidmonthname -msgid "Error: Invalid Month Name." +msgid "Error: Invalid month name." msgstr "" #: vpsr.rsinvalidtablespecified @@ -635,7 +499,7 @@ msgid "Error: Invalid table specified." msgstr "" #: vpsr.rsinvalidyear -msgid "Error: Invalid Year." +msgid "Error: Invalid year." msgstr "" #: vpsr.rslastnamelbl @@ -720,36 +584,11 @@ msgid "Error: Month Is Required." msgstr "" #: vpsr.rsmonthlybydate -msgid "Monthly By Date" +msgid "Monthly by date" msgstr "" #: vpsr.rsmonthlybyday -msgid "Monthly By Day" -msgstr "" - -#: vpsr.rsmonthpopupnextmonth -msgctxt "vpsr.rsmonthpopupnextmonth" -msgid "Next Month" -msgstr "" - -#: vpsr.rsmonthpopupnextyear -msgctxt "vpsr.rsmonthpopupnextyear" -msgid "Next Year" -msgstr "" - -#: vpsr.rsmonthpopupprevmonth -msgctxt "vpsr.rsmonthpopupprevmonth" -msgid "Previous Month" -msgstr "" - -#: vpsr.rsmonthpopupprevyear -msgctxt "vpsr.rsmonthpopupprevyear" -msgid "Previous Year" -msgstr "" - -#: vpsr.rsmonthpopuptoday -msgctxt "vpsr.rsmonthpopuptoday" -msgid "Today" +msgid "Monthly by day" msgstr "" #: vpsr.rsmonths @@ -784,6 +623,24 @@ msgstr "" msgid "New file" msgstr "" +#: vpsr.rsnextday +msgctxt "vpsr.rsnextday" +msgid "Next day" +msgstr "" + +#: vpsr.rsnextmonth +msgid "Next month" +msgstr "" + +#: vpsr.rsnextweek +msgctxt "vpsr.rsnextweek" +msgid "Next week" +msgstr "" + +#: vpsr.rsnextyear +msgid "Next year" +msgstr "" + #: vpsr.rsno msgid "N" msgstr "" @@ -879,7 +736,7 @@ msgid "Assistant" msgstr "" #: vpsr.rsphonetypelabel10 -msgid "Other Fax" +msgid "Other fax" msgstr "" #: vpsr.rsphonetypelabel11 @@ -907,7 +764,7 @@ msgid "Work" msgstr "" #: vpsr.rsphonetypelabel17 -msgid "Work Fax" +msgid "Work fax" msgstr "" #: vpsr.rsphonetypelabel2 @@ -928,7 +785,7 @@ msgid "Home" msgstr "" #: vpsr.rsphonetypelabel6 -msgid "Home Fax" +msgid "Home fax" msgstr "" #: vpsr.rsphonetypelabel7 @@ -960,6 +817,24 @@ msgstr "" msgid "Position:" msgstr "" +#: vpsr.rsprevday +msgctxt "vpsr.rsprevday" +msgid "Previous day" +msgstr "" + +#: vpsr.rsprevmonth +msgid "Previous month" +msgstr "" + +#: vpsr.rsprevweek +msgctxt "vpsr.rsprevweek" +msgid "Previous week" +msgstr "" + +#: vpsr.rsprevyear +msgid "Previous year" +msgstr "" + #: vpsr.rsprintbtn msgctxt "vpsr.rsprintbtn" msgid "&Print" @@ -1136,15 +1011,15 @@ msgid "Task complete" msgstr "" #: vpsr.rstaskpopupadd -msgid "Add Task..." +msgid "Add task..." msgstr "" #: vpsr.rstaskpopupdelete -msgid "Delete Task..." +msgid "Delete task..." msgstr "" #: vpsr.rstaskpopupedit -msgid "Edit Task..." +msgid "Edit task..." msgstr "" #: vpsr.rstaskselement @@ -1152,11 +1027,11 @@ msgid "Tasks" msgstr "" #: vpsr.rstasktitlenoresource -msgid "Task List" +msgid "Task list" msgstr "" #: vpsr.rstasktitleresource -msgid "Task List - " +msgid "Task list - " msgstr "" #: vpsr.rstextcaption @@ -1191,6 +1066,16 @@ msgstr "" msgid "top-left to bottom-right line" msgstr "" +#: vpsr.rstoday +msgctxt "vpsr.rstoday" +msgid "Today" +msgstr "" + +#: vpsr.rstomorrow +msgctxt "vpsr.rstomorrow" +msgid "Tomorrow" +msgstr "" + #: vpsr.rstop msgid "Top" msgstr "" @@ -1238,56 +1123,21 @@ msgstr "" #: vpsr.rsweekpopupadd msgctxt "vpsr.rsweekpopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "" #: vpsr.rsweekpopupdelete -msgid "&Delete Event..." +msgid "&Delete event..." msgstr "" #: vpsr.rsweekpopupedit msgctxt "vpsr.rsweekpopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "" #: vpsr.rsweekpopupnav msgctxt "vpsr.rsweekpopupnav" -msgid "Change Date" -msgstr "" - -#: vpsr.rsweekpopupnavnextmonth -msgctxt "vpsr.rsweekpopupnavnextmonth" -msgid "Next Month" -msgstr "" - -#: vpsr.rsweekpopupnavnextweek -msgctxt "vpsr.rsweekpopupnavnextweek" -msgid "Next Week" -msgstr "" - -#: vpsr.rsweekpopupnavnextyear -msgctxt "vpsr.rsweekpopupnavnextyear" -msgid "Next Year" -msgstr "" - -#: vpsr.rsweekpopupnavprevmonth -msgctxt "vpsr.rsweekpopupnavprevmonth" -msgid "Previous Month" -msgstr "" - -#: vpsr.rsweekpopupnavprevweek -msgctxt "vpsr.rsweekpopupnavprevweek" -msgid "Previous Week" -msgstr "" - -#: vpsr.rsweekpopupnavprevyear -msgctxt "vpsr.rsweekpopupnavprevyear" -msgid "Previous Year" -msgstr "" - -#: vpsr.rsweekpopupnavtoday -msgctxt "vpsr.rsweekpopupnavtoday" -msgid "Today" +msgid "Change date" msgstr "" #: vpsr.rsweeks @@ -1323,11 +1173,11 @@ msgid "Error: Year is required." msgstr "" #: vpsr.rsyearlybydate -msgid "Yearly By Date" +msgid "Yearly by date" msgstr "" #: vpsr.rsyearlybyday -msgid "Yearly By Day" +msgid "Yearly by day" msgstr "" #: vpsr.rsyears @@ -1338,6 +1188,11 @@ msgstr "" msgid "Y" msgstr "" +#: vpsr.rsyesterday +msgctxt "vpsr.rsyesterday" +msgid "Yesterday" +msgstr "" + #: vpsr.rszipcodelbl msgid "Zip code:" msgstr "" diff --git a/components/tvplanit/languages/vpsr.ru.po b/components/tvplanit/languages/vpsr.ru.po index 4bd7f1dad..be974450e 100644 --- a/components/tvplanit/languages/vpsr.ru.po +++ b/components/tvplanit/languages/vpsr.ru.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" #: vpsr.rs1day msgid "1 day" @@ -119,66 +119,16 @@ msgstr "" msgid "Calendar" msgstr "Календарь" -#: vpsr.rscalendarnextmonth -msgctxt "vpsr.rscalendarnextmonth" -msgid "Next Month" -msgstr "Следующий месяц" - -#: vpsr.rscalendarnextyear -msgctxt "vpsr.rscalendarnextyear" -msgid "Next Year" -msgstr "Следующий год" - -#: vpsr.rscalendarpopupnextmonth -msgctxt "vpsr.rscalendarpopupnextmonth" -msgid "Next Month" -msgstr "Следующий месяц" - -#: vpsr.rscalendarpopupnextyear -msgctxt "vpsr.rscalendarpopupnextyear" -msgid "Next Year" -msgstr "Следующий год" - -#: vpsr.rscalendarpopupprevmonth -msgctxt "vpsr.rscalendarpopupprevmonth" -msgid "Previous Month" -msgstr "Предыдущий месяц" - -#: vpsr.rscalendarpopupprevyear -msgctxt "vpsr.rscalendarpopupprevyear" -msgid "Previous Year" -msgstr "Предыдущий год" - #: vpsr.rscalendarpopuprevert msgctxt "vpsr.rscalendarpopuprevert" msgid "Revert" msgstr "Возврат" -#: vpsr.rscalendarpopuptoday -msgctxt "vpsr.rscalendarpopuptoday" -msgid "Today" -msgstr "Сегодня" - -#: vpsr.rscalendarprevmonth -msgctxt "vpsr.rscalendarprevmonth" -msgid "Previous Month" -msgstr "Предыдущий месяц" - -#: vpsr.rscalendarprevyear -msgctxt "vpsr.rscalendarprevyear" -msgid "Previous Year" -msgstr "Предыдущий год" - #: vpsr.rscalendarrevert msgctxt "vpsr.rscalendarrevert" msgid "Revert" msgstr "Возврат" -#: vpsr.rscalendartoday -msgctxt "vpsr.rscalendartoday" -msgid "Today" -msgstr "Сегодня" - #: vpsr.rscalendarweekabbr msgid "CW" msgstr "Номер недели:" @@ -274,15 +224,15 @@ msgid "Delete this task from your list?" msgstr "Удалить эту задачу из вашего списка?" #: vpsr.rscontactpopupadd -msgid "Add Contact..." +msgid "Add contact..." msgstr "Добавить контакт..." #: vpsr.rscontactpopupdelete -msgid "Delete Contact..." +msgid "Delete contact..." msgstr "Удалить контакт..." #: vpsr.rscontactpopupedit -msgid "Edit Contact..." +msgid "Edit contact..." msgstr "Изменить контакт" #: vpsr.rscontactselement @@ -331,76 +281,23 @@ msgstr "Ошибка: Необходимо указать день" #: vpsr.rsdaypopupadd msgctxt "vpsr.rsdaypopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "Добавить событие..." #: vpsr.rsdaypopupdelete -msgid "Delete Event..." +msgid "Delete event..." msgstr "Удалить событие..." #: vpsr.rsdaypopupedit msgctxt "vpsr.rsdaypopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Изменить событие..." #: vpsr.rsdaypopupnav msgctxt "vpsr.rsdaypopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Изменить дату" -#: vpsr.rsdaypopupnavnextday -msgid "Next Day" -msgstr "Следующий день" - -#: vpsr.rsdaypopupnavnextmonth -msgctxt "vpsr.rsdaypopupnavnextmonth" -msgid "Next Month" -msgstr "Следующий месяц" - -#: vpsr.rsdaypopupnavnextweek -msgctxt "vpsr.rsdaypopupnavnextweek" -msgid "Next Week" -msgstr "Следующая неделя" - -#: vpsr.rsdaypopupnavnextyear -msgctxt "vpsr.rsdaypopupnavnextyear" -msgid "Next Year" -msgstr "Следующий год" - -#: vpsr.rsdaypopupnavprevday -msgid "Previous Day" -msgstr "Предыдущий день" - -#: vpsr.rsdaypopupnavprevmonth -msgctxt "vpsr.rsdaypopupnavprevmonth" -msgid "Previous Month" -msgstr "Предыдущий месяц" - -#: vpsr.rsdaypopupnavprevweek -msgctxt "vpsr.rsdaypopupnavprevweek" -msgid "Previous Week" -msgstr "Предыдущая неделя" - -#: vpsr.rsdaypopupnavprevyear -msgctxt "vpsr.rsdaypopupnavprevyear" -msgid "Previous Year" -msgstr "Предыдущий год" - -#: vpsr.rsdaypopupnavtoday -msgctxt "vpsr.rsdaypopupnavtoday" -msgid "Today" -msgstr "Сегодня" - -#: vpsr.rsdaypopupnavtomorrow -msgctxt "vpsr.rsdaypopupnavtomorrow" -msgid "Tomorrow" -msgstr "Завтра" - -#: vpsr.rsdaypopupnavyesterday -msgctxt "vpsr.rsdaypopupnavyesterday" -msgid "Yesterday" -msgstr "Вчера" - #: vpsr.rsdays msgid "Days" msgstr "Дни" @@ -471,7 +368,7 @@ msgid "Due Date:" msgstr "Срок:" #: vpsr.rsduplicateresource -msgid "Error: Duplicate Resource." +msgid "Error: Duplicate resource." msgstr "Ошибка: Дубликат ресурсов." #: vpsr.rseditbtn @@ -487,11 +384,11 @@ msgid "Edit format" msgstr "Изменить формат" #: vpsr.rseditingfolders -msgid "Folder Editor." +msgid "Folder editor." msgstr "Редактор папки" #: vpsr.rseditingitems -msgid "Folder Items Editor." +msgid "Folder items editor." msgstr "Редактор элемента папки." #: vpsr.rseditprintformat @@ -575,39 +472,6 @@ msgstr "из вашего расписания?" msgid "Height" msgstr "Высота" -#: vpsr.rshintnextday -msgid "Next day" -msgstr "Следующий день" - -#: vpsr.rshintnextweek -msgctxt "vpsr.rshintnextweek" -msgid "Next week" -msgstr "Следующая неделя" - -#: vpsr.rshintprevday -msgid "Previous day" -msgstr "Предыдущий день" - -#: vpsr.rshintprevweek -msgctxt "vpsr.rshintprevweek" -msgid "Previous week" -msgstr "Предыдущая неделя" - -#: vpsr.rshinttoday -msgctxt "vpsr.rshinttoday" -msgid "Today" -msgstr "Сегодня" - -#: vpsr.rshinttomorrow -msgctxt "vpsr.rshinttomorrow" -msgid "Tomorrow" -msgstr "Завтра" - -#: vpsr.rshintyesterday -msgctxt "vpsr.rshintyesterday" -msgid "Yesterday" -msgstr "Вчера" - #: vpsr.rshours msgid "Hours" msgstr "Часы" @@ -625,19 +489,19 @@ msgid "Interval (days):" msgstr "Интервал (дни):" #: vpsr.rsinvaliddate -msgid "Error: Invalid Date." +msgid "Error: Invalid date." msgstr "Ошибка: Не верная дата." #: vpsr.rsinvalidday -msgid "Error: Invalid Day." +msgid "Error: Invalid day." msgstr "Ошибка: Не верный день." #: vpsr.rsinvalidmonth -msgid "Error: Invalid Month." +msgid "Error: Invalid month." msgstr "Ошибка: Не верный месяц." #: vpsr.rsinvalidmonthname -msgid "Error: Invalid Month Name." +msgid "Error: Invalid month name." msgstr "Ошибка: Не верное имя месяца." #: vpsr.rsinvalidtablespecified @@ -645,7 +509,7 @@ msgid "Error: Invalid table specified." msgstr "Ошибка: Не верное определение таблицы." #: vpsr.rsinvalidyear -msgid "Error: Invalid Year." +msgid "Error: Invalid year." msgstr "Ошибка: Не верный год." #: vpsr.rslastnamelbl @@ -730,38 +594,13 @@ msgid "Error: Month Is Required." msgstr "Ошибка: Необходим месяц." #: vpsr.rsmonthlybydate -msgid "Monthly By Date" +msgid "Monthly by date" msgstr "Ежемесячно" #: vpsr.rsmonthlybyday -msgid "Monthly By Day" +msgid "Monthly by day" msgstr "Ежемесячную" -#: vpsr.rsmonthpopupnextmonth -msgctxt "vpsr.rsmonthpopupnextmonth" -msgid "Next Month" -msgstr "Следующий месяц" - -#: vpsr.rsmonthpopupnextyear -msgctxt "vpsr.rsmonthpopupnextyear" -msgid "Next Year" -msgstr "Следующий год" - -#: vpsr.rsmonthpopupprevmonth -msgctxt "vpsr.rsmonthpopupprevmonth" -msgid "Previous Month" -msgstr "Предыдущий месяц" - -#: vpsr.rsmonthpopupprevyear -msgctxt "vpsr.rsmonthpopupprevyear" -msgid "Previous Year" -msgstr "Предыдущий год" - -#: vpsr.rsmonthpopuptoday -msgctxt "vpsr.rsmonthpopuptoday" -msgid "Today" -msgstr "Сегодня" - #: vpsr.rsmonths msgid "Months" msgstr "Месяц" @@ -794,6 +633,24 @@ msgstr "" msgid "New file" msgstr "" +#: vpsr.rsnextday +msgctxt "vpsr.rsnextday" +msgid "Next day" +msgstr "Следующий день" + +#: vpsr.rsnextmonth +msgid "Next month" +msgstr "" + +#: vpsr.rsnextweek +msgctxt "vpsr.rsnextweek" +msgid "Next week" +msgstr "Следующая неделя" + +#: vpsr.rsnextyear +msgid "Next year" +msgstr "" + #: vpsr.rsno msgid "N" msgstr "" @@ -889,7 +746,7 @@ msgid "Assistant" msgstr "Ассистент" #: vpsr.rsphonetypelabel10 -msgid "Other Fax" +msgid "Other fax" msgstr "Другой факс" #: vpsr.rsphonetypelabel11 @@ -917,7 +774,7 @@ msgid "Work" msgstr "Рабочий" #: vpsr.rsphonetypelabel17 -msgid "Work Fax" +msgid "Work fax" msgstr "Рабочий факс" #: vpsr.rsphonetypelabel2 @@ -938,7 +795,7 @@ msgid "Home" msgstr "Домашний" #: vpsr.rsphonetypelabel6 -msgid "Home Fax" +msgid "Home fax" msgstr "Домашний факс" #: vpsr.rsphonetypelabel7 @@ -970,6 +827,24 @@ msgstr "Позиция" msgid "Position:" msgstr "Позиция:" +#: vpsr.rsprevday +msgctxt "vpsr.rsprevday" +msgid "Previous day" +msgstr "Предыдущий день" + +#: vpsr.rsprevmonth +msgid "Previous month" +msgstr "" + +#: vpsr.rsprevweek +msgctxt "vpsr.rsprevweek" +msgid "Previous week" +msgstr "Предыдущая неделя" + +#: vpsr.rsprevyear +msgid "Previous year" +msgstr "" + #: vpsr.rsprintbtn msgctxt "vpsr.rsprintbtn" msgid "&Print" @@ -1120,8 +995,6 @@ msgid "Incorrect order of start and end times. Do you want to flip them?" msgstr "" #: vpsr.rsstarttimelbl -#, fuzzy -#| msgid "Start Time:" msgid "Start time:" msgstr "Время начала:" @@ -1148,15 +1021,15 @@ msgid "Task complete" msgstr "Задача выполнена" #: vpsr.rstaskpopupadd -msgid "Add Task..." +msgid "Add task..." msgstr "Добавит задачу..." #: vpsr.rstaskpopupdelete -msgid "Delete Task..." +msgid "Delete task..." msgstr "Удалить задачу..." #: vpsr.rstaskpopupedit -msgid "Edit Task..." +msgid "Edit task..." msgstr "Изменить задачу..." #: vpsr.rstaskselement @@ -1164,11 +1037,11 @@ msgid "Tasks" msgstr "" #: vpsr.rstasktitlenoresource -msgid "Task List" +msgid "Task list" msgstr "Список задач" #: vpsr.rstasktitleresource -msgid "Task List - " +msgid "Task list - " msgstr "Список задач - " #: vpsr.rstextcaption @@ -1203,6 +1076,16 @@ msgstr "Заголовок:" msgid "top-left to bottom-right line" msgstr "" +#: vpsr.rstoday +msgctxt "vpsr.rstoday" +msgid "Today" +msgstr "Сегодня" + +#: vpsr.rstomorrow +msgctxt "vpsr.rstomorrow" +msgid "Tomorrow" +msgstr "Завтра" + #: vpsr.rstop msgid "Top" msgstr "" @@ -1250,58 +1133,23 @@ msgstr "Неделя" #: vpsr.rsweekpopupadd msgctxt "vpsr.rsweekpopupadd" -msgid "Add Event..." +msgid "Add event..." msgstr "Добавить событие..." #: vpsr.rsweekpopupdelete -msgid "&Delete Event..." +msgid "&Delete event..." msgstr "Удалить событие..." #: vpsr.rsweekpopupedit msgctxt "vpsr.rsweekpopupedit" -msgid "Edit Event..." +msgid "Edit event..." msgstr "Изменить событие..." #: vpsr.rsweekpopupnav msgctxt "vpsr.rsweekpopupnav" -msgid "Change Date" +msgid "Change date" msgstr "Изменить дату" -#: vpsr.rsweekpopupnavnextmonth -msgctxt "vpsr.rsweekpopupnavnextmonth" -msgid "Next Month" -msgstr "Следующий месяц" - -#: vpsr.rsweekpopupnavnextweek -msgctxt "vpsr.rsweekpopupnavnextweek" -msgid "Next Week" -msgstr "Следующая неделя" - -#: vpsr.rsweekpopupnavnextyear -msgctxt "vpsr.rsweekpopupnavnextyear" -msgid "Next Year" -msgstr "Следующий год" - -#: vpsr.rsweekpopupnavprevmonth -msgctxt "vpsr.rsweekpopupnavprevmonth" -msgid "Previous Month" -msgstr "Предыдущий месяц" - -#: vpsr.rsweekpopupnavprevweek -msgctxt "vpsr.rsweekpopupnavprevweek" -msgid "Previous Week" -msgstr "Предыдущая неделя" - -#: vpsr.rsweekpopupnavprevyear -msgctxt "vpsr.rsweekpopupnavprevyear" -msgid "Previous Year" -msgstr "Предыдущий год" - -#: vpsr.rsweekpopupnavtoday -msgctxt "vpsr.rsweekpopupnavtoday" -msgid "Today" -msgstr "Сегодня" - #: vpsr.rsweeks msgid "Weeks" msgstr "" @@ -1335,11 +1183,11 @@ msgid "Error: Year is required." msgstr "Ошибка: Не указан год." #: vpsr.rsyearlybydate -msgid "Yearly By Date" +msgid "Yearly by date" msgstr "Ежегодно по дате" #: vpsr.rsyearlybyday -msgid "Yearly By Day" +msgid "Yearly by day" msgstr "Ежегодно по дню" #: vpsr.rsyears @@ -1350,9 +1198,12 @@ msgstr "" msgid "Y" msgstr "" +#: vpsr.rsyesterday +msgctxt "vpsr.rsyesterday" +msgid "Yesterday" +msgstr "Вчера" + #: vpsr.rszipcodelbl -#, fuzzy -#| msgid "Zip Code:" msgid "Zip code:" msgstr "Почтовый индекс:" @@ -1639,4 +1490,3 @@ msgstr "" #: vpsr.sxmldecnotatbeg msgid "The XML declaration must appear before the first element" msgstr "" - diff --git a/components/tvplanit/source/vpcalendar.pas b/components/tvplanit/source/vpcalendar.pas index 5a5eb3c8f..01d59c635 100644 --- a/components/tvplanit/source/vpcalendar.pas +++ b/components/tvplanit/source/vpcalendar.pas @@ -808,28 +808,28 @@ begin clBtnLeft.Parent := Self; clBtnLeft.Glyph.LoadFromResourceName(HINSTANCE,'VPLEFTARROW'); //soner geändert: clBtnLeft.Glyph.Handle := LoadBaseBitmap('VPLEFTARROW'); clBtnLeft.OnClick := calBtnClick; - clBtnLeft.Hint := RSCalendarPrevMonth; + clBtnLeft.Hint := RSPrevMonth; clBtnLeft.ShowHint := True; clBtnRight := TSpeedButton.Create(Self); clBtnRight.Parent := Self; clBtnRight.Glyph.LoadFromResourceName(HINSTANCE,'VPRIGHTARROW'); //soner geändert: clBtnRight.Glyph.Handle := LoadBaseBitmap('VPRIGHTARROW'); clBtnRight.OnClick := calBtnClick; - clBtnRight.Hint := RSCalendarNextMonth; + clBtnRight.Hint := RSNextMonth; clBtnRight.ShowHint := True; clBtnNextYear := TSpeedButton.Create(Self); clBtnNextYear.Parent := Self; clBtnNextYear.Glyph.LoadFromResourceName(HINSTANCE,'VPRIGHTARROWS'); //soner geöndert: clBtnNextYear.Glyph.Handle := LoadBaseBitmap('VPRIGHTARROWS'); clBtnNextYear.OnClick := calBtnClick; - clBtnNextYear.Hint := RSCalendarNextYear; + clBtnNextYear.Hint := RSNextYear; clBtnNextYear.ShowHint := True; clBtnPrevYear := TSpeedButton.Create(Self); clBtnPrevYear.Parent := Self; clBtnPrevYear.Glyph.LoadFromResourceName(HINSTANCE,'VPLEFTARROWS'); //soner geöndert: clBtnPrevYear.Glyph.Handle := LoadBaseBitmap('VPLEFTARROWS'); clBtnPrevYear.OnClick := calBtnClick; - clBtnPrevYear.Hint := RSCalendarPrevYear; + clBtnPrevYear.Hint := RSPrevYear; clBtnPrevYear.ShowHint := True; {create "revert" button} @@ -845,7 +845,7 @@ begin clBtnToday.Parent := Self; clBtnToday.Glyph.LoadFromResourceName(HINSTANCE,'VPTODAY'); //soner geändert: clBtnToday.Glyph.Handle := LoadBaseBitmap('VPTODAY'); clBtnToday.OnClick := calBtnClick; - clBtnToday.Hint := RSCalendarToday; + clBtnToday.Hint := RSToday; clBtnToday.ShowHint := True; {assign default color scheme} @@ -1653,37 +1653,37 @@ procedure TVpCustomCalendar.InitializeDefaultPopup; var NewItem: TMenuItem; begin - if RSCalendarPopupToday <> '' then begin + if RSToday <> '' then begin NewItem := TMenuItem.Create (Self); - NewItem.Caption := RSCalendarPopupToday; + NewItem.Caption := RSToday; NewItem.OnClick := PopupToday; FDefaultPopup.Items.Add (NewItem); end; - if RSCalendarPopupNextMonth <> '' then begin + if RSNextMonth <> '' then begin NewItem := TMenuItem.Create (Self); - NewItem.Caption := RSCalendarPopupNextMonth; + NewItem.Caption := RSNextMonth; NewItem.OnClick := PopupNextMonth; FDefaultPopup.Items.Add (NewItem); end; - if RSCalendarPopupPrevMonth <> '' then begin + if RSPrevMonth <> '' then begin NewItem := TMenuItem.Create (Self); - NewItem.Caption := RSCalendarPopupPrevMonth; + NewItem.Caption := RSPrevMonth; NewItem.OnClick := PopupPrevMonth; FDefaultPopup.Items.Add (NewItem); end; - if RSCalendarPopupNextYear <> '' then begin + if RSNextYear <> '' then begin NewItem := TMenuItem.Create (Self); - NewItem.Caption := RSCalendarPopupNextYear; + NewItem.Caption := RSNextYear; NewItem.OnClick := PopupNextYear; FDefaultPopup.Items.Add (NewItem); end; - if RSCalendarPopupPrevYear <> '' then begin + if RSPrevYear <> '' then begin NewItem := TMenuItem.Create (Self); - NewItem.Caption := RSCalendarPopupPrevYear; + NewItem.Caption := RSPrevYear; NewItem.OnClick := PopupPrevYear; FDefaultPopup.Items.Add (NewItem); end; diff --git a/components/tvplanit/source/vpdata.pas b/components/tvplanit/source/vpdata.pas index f822fc90d..5d6def407 100644 --- a/components/tvplanit/source/vpdata.pas +++ b/components/tvplanit/source/vpdata.pas @@ -60,6 +60,9 @@ type TVpContactSort = (csLastFirst, csFirstLast); + TVpOverlayPattern = (opHorizontal=2, opVertical, opFDiagonal, + opBDiagonal, opCross, opDiagCross); + { forward declarations } TVpResource = class; TVpResourceGroup = class; @@ -186,8 +189,10 @@ type FCaption: String; FIDs: Array of Integer; FReadOnly: Boolean; + FPattern: TVpOverlayPattern; function GetCount: integer; function GetItem(AIndex: Integer): TVpResource; + procedure SetPattern(AValue: TVpOverlayPattern); public constructor Create(AOwner: TVpResources; ACaption: String; AResourceID: Integer); destructor Destroy; override; @@ -201,6 +206,7 @@ type property Items[AIndex: Integer]: TVpResource read GetItem; default; property ResourceID: Integer read FResourceID; property ReadOnly: boolean read FReadOnly write FReadOnly; + property Pattern: TVpOverlayPattern read FPattern write SetPattern; end; TVpSchedule = class @@ -985,6 +991,7 @@ begin FOwner := AOwner; FResourceID := AResourceID; FCaption := ACaption; + FPattern := opBDiagonal; Clear; end; @@ -1077,6 +1084,13 @@ begin end; end; +procedure TVpResourceGroup.SetPattern(AValue: TVpOverlayPattern); +begin + if FPattern = AValue then + exit; + FPattern := AValue; +end; + (*****************************************************************************) { TVpEvent } diff --git a/components/tvplanit/source/vpdayview.pas b/components/tvplanit/source/vpdayview.pas index e323d2927..dfca3e782 100644 --- a/components/tvplanit/source/vpdayview.pas +++ b/components/tvplanit/source/vpdayview.pas @@ -809,11 +809,11 @@ end; procedure TVpDayView.LoadLanguage; begin - dvDayUpBtn.Hint := RSHintNextDay; //rsHintTomorrow; - dvDayDownBtn.Hint := RSHintPrevDay; //rsHintYesterday; - dvTodayBtn.Hint := RSHintToday; - dvWeekUpBtn.Hint := RSHintNextWeek; - dvWeekDownBtn.Hint := RSHintPrevWeek; + dvDayUpBtn.Hint := RSNextDay; + dvDayDownBtn.Hint := RSPrevDay; + dvTodayBtn.Hint := RSToday; + dvWeekUpBtn.Hint := RSNextWeek; + dvWeekDownBtn.Hint := RSPrevWeek; FDefaultPopup.Items.Clear; InitializeDefaultPopup; end; @@ -931,89 +931,109 @@ begin NewItem.Tag := 0; FDefaultPopup.Items.Add(NewItem); - if RSDayPopupNavToday <> '' then begin + if RSToday <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavToday; + NewSubItem.Caption := RSToday; NewSubItem.OnClick := PopupToday; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavYesterday <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSYesterday <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavYesterday; + NewSubItem.Caption := RSYesterday; NewSubItem.OnClick := PopupYesterday; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavTomorrow <> '' then begin + if RSTomorrow <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavTomorrow; + NewSubItem.Caption := RSTomorrow; NewSubItem.OnClick := PopupTomorrow; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavNextDay <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSNextDay <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavNextDay; + NewSubItem.Caption := RSNextDay; NewSubItem.OnClick := PopupNextDay; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavPrevDay <> '' then begin + if RSPrevDay <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavPrevDay; + NewSubItem.Caption := RSPrevDay; NewSubItem.OnClick := PopupPrevDay; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavNextWeek <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSNextWeek <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavNextWeek; + NewSubItem.Caption := RSNextWeek; NewSubItem.OnClick := PopupNextWeek; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavPrevWeek <> '' then begin + if RSPrevWeek <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavPrevWeek; + NewSubItem.Caption := RSPrevWeek; NewSubItem.OnClick := PopupPrevWeek; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavNextMonth <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSNextMonth <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavNextMonth; + NewSubItem.Caption := RSNextMonth; NewSubItem.OnClick := PopupNextMonth; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavPrevMonth <> '' then begin + if RSPrevMonth <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavPrevMonth; + NewSubItem.Caption := RSPrevMonth; NewSubItem.OnClick := PopupPrevMonth; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavNextYear <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSNextYear <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavNextYear; + NewSubItem.Caption := RSNextYear; NewSubItem.OnClick := PopupNextYear; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSDayPopupNavPrevYear <> '' then begin + if RSPrevYear <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSDayPopupNavPrevYear; + NewSubItem.Caption := RSPrevYear; NewSubItem.OnClick := PopupPrevYear; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); diff --git a/components/tvplanit/source/vpdayviewpainter.pas b/components/tvplanit/source/vpdayviewpainter.pas index db0c32798..8ef30c46d 100644 --- a/components/tvplanit/source/vpdayviewpainter.pas +++ b/components/tvplanit/source/vpdayviewpainter.pas @@ -837,7 +837,7 @@ begin end else RenderCanvas.Brush.Color := WindowColor; if AEvent.IsOverlayed then - RenderCanvas.Brush.Style := bsBDiagonal; + RenderCanvas.Brush.Style := OverlayPatternToBrushStyle(AEvent.GetResource.Group.Pattern); TPSFillRect(RenderCanvas, Angle, RenderIn, EventRect); RenderCanvas.Brush.Style := bsSolid; diff --git a/components/tvplanit/source/vpmisc.pas b/components/tvplanit/source/vpmisc.pas index c2f63a926..bf452deaf 100644 --- a/components/tvplanit/source/vpmisc.pas +++ b/components/tvplanit/source/vpmisc.pas @@ -143,6 +143,7 @@ function EncodeLineEndings(const AText: String): String; procedure AddResourceGroupMenu(AMenu: TMenuItem; AResource: TVpResource; AEventHandler: TNotifyEvent); +function OverlayPatternToBrushStyle(APattern: TVpOverlayPattern): TBrushStyle; {$IFDEF LCL} procedure HighDPI(FromDPI: integer); @@ -754,6 +755,11 @@ begin end; end; +function OverlayPatternToBrushStyle(APattern: TVpOverlayPattern): TBrushStyle; +begin + Result := TBrushStyle(APattern); +end; + {$IFDEF LCL} procedure HighDPI(FromDPI: integer); var diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas index f3bc3d1c8..0409051f2 100644 --- a/components/tvplanit/source/vpmonthview.pas +++ b/components/tvplanit/source/vpmonthview.pas @@ -859,37 +859,45 @@ procedure TVpMonthView.InitializeDefaultPopup; var NewItem : TMenuItem; begin - if RSMonthPopupToday <> '' then begin + if RSToday <> '' then begin NewItem := TMenuItem.Create(Self); - NewItem.Caption := RSMonthPopupToday; + NewItem.Caption := RSToday; NewItem.OnClick := PopupToday; FDefaultPopup.Items.Add (NewItem); end; - if RSMonthPopupNextMonth <> '' then begin + NewItem := TMenuItem.Create(Self); + NewItem.Caption := '-'; + FDefaultPopup.Items.Add(NewItem); + + if RSNextMonth <> '' then begin NewItem := TMenuItem.Create(Self); - NewItem.Caption := RSMonthPopupNextMonth; + NewItem.Caption := RSNextMonth; NewItem.OnClick := PopupNextMonth; FDefaultPopup.Items.Add (NewItem); end; - if RSMonthPopupPrevMonth <> '' then begin + if RSPrevMonth <> '' then begin NewItem := TMenuItem.Create(Self); - NewItem.Caption := RSMonthPopupPrevMonth; + NewItem.Caption := RSPrevMonth; NewItem.OnClick := PopupPrevMonth; FDefaultPopup.Items.Add (NewItem); end; - if RSMonthPopupNextYear <> '' then begin + NewItem := TMenuItem.Create(Self); + NewItem.Caption := '-'; + FDefaultPopup.Items.Add(NewItem); + + if RSNextYear <> '' then begin NewItem := TMenuItem.Create(Self); - NewItem.Caption := RSMonthPopupNextYear; + NewItem.Caption := RSNextYear; NewItem.OnClick := PopupNextYear; FDefaultPopup.Items.Add (NewItem); end; - if RSMonthPopupPrevYear <> '' then begin + if RSPrevYear <> '' then begin NewItem := TMenuItem.Create(Self); - NewItem.Caption := RSMonthPopupPrevYear; + NewItem.Caption := RSPrevYear; NewItem.OnClick := PopupPrevYear; FDefaultPopup.Items.Add (NewItem); end; diff --git a/components/tvplanit/source/vpsr.inc b/components/tvplanit/source/vpsr.inc index fc71c6696..9a5c4a9fc 100644 --- a/components/tvplanit/source/vpsr.inc +++ b/components/tvplanit/source/vpsr.inc @@ -40,17 +40,17 @@ resourcestring RSNotDoneYet = 'This feature is not implemented at this time.'; RSNoTimersAvail = 'No Window''s timers are available.'; RSBadTriggerHandle = 'Invalid trigger handle.'; - RSEditingItems = 'Folder Items Editor.'; - RSEditingFolders = 'Folder Editor.'; + RSEditingItems = 'Folder items editor.'; + RSEditingFolders = 'Folder editor.'; RSExclusiveEventConflict = 'Conflicts with another exclusive event.'; RSBackwardTimesError = 'The end time cannot precede the start time.'; RSDBPostError = 'Error posting data to the database.'; RSMonthConvertError = 'Error converting the month number.'; - RSInvalidDay = 'Error: Invalid Day.'; - RSInvalidDate = 'Error: Invalid Date.'; - RSInvalidMonth = 'Error: Invalid Month.'; - RSInvalidMonthName = 'Error: Invalid Month Name.'; - RSInvalidYear = 'Error: Invalid Year.'; + RSInvalidDay = 'Error: Invalid day.'; + RSInvalidDate = 'Error: Invalid date.'; + RSInvalidMonth = 'Error: Invalid month.'; + RSInvalidMonthName = 'Error: Invalid month name.'; + RSInvalidYear = 'Error: Invalid year.'; RSDayIsRequired = 'Error: Day is required.'; RSMonthIsRequired = 'Error: Month Is Required.'; RSYearIsRequired = 'Error: Year is required.'; @@ -59,7 +59,7 @@ resourcestring RSFailToCreateEvent = 'Error: Failure while creating Event.'; RSFailToCreateContact = 'Error: Failure while creating Contact.'; RSFailToCreateResource = 'Error: Failure while creating Resource.'; - RSDuplicateResource = 'Error: Duplicate Resource.'; + RSDuplicateResource = 'Error: Duplicate resource.'; RSInvalidTableSpecified = 'Error: Invalid table specified.'; RSUnableToOpen = 'Error: Unable to open '; RSSQLUpdateError = 'Error: Unable to update '; {!!.01} @@ -69,18 +69,18 @@ resourcestring RSPhoneTypeLabel3 = 'Car'; RSPhoneTypeLabel4 = 'Company'; RSPhoneTypeLabel5 = 'Home'; - RSPhoneTypeLabel6 = 'Home Fax'; + RSPhoneTypeLabel6 = 'Home fax'; RSPhoneTypeLabel7 = 'ISDN'; RSPhoneTypeLabel8 = 'Mobile'; RSPhoneTypeLabel9 = 'Other'; - RSPhoneTypeLabel10 = 'Other Fax'; + RSPhoneTypeLabel10 = 'Other fax'; RSPhoneTypeLabel11 = 'Pager'; RSPhoneTypeLabel12 = 'Primary'; RSPhoneTypeLabel13 = 'Radio'; RSPhoneTypeLabel14 = 'Telex'; RSPhoneTypeLabel15 = 'TTY/TDD'; RSPhoneTypeLabel16 = 'Work'; - RSPhoneTypeLabel17 = 'Work Fax'; + RSPhoneTypeLabel17 = 'Work fax'; RSCategoryLabel1 = 'Business'; RSCategoryLabel2 = 'Clients'; @@ -114,10 +114,10 @@ resourcestring RSNone = 'None'; RSDaily = 'Daily'; RSWeekly = 'Weekly'; - RSMonthlyByDay = 'Monthly By Day'; - RSMonthlyByDate = 'Monthly By Date'; - RSYearlyByDay = 'Yearly By Day'; - RSYearlyByDate = 'Yearly By Date'; + RSMonthlyByDay = 'Monthly by day'; + RSMonthlyByDate = 'Monthly by date'; + RSYearlyByDay = 'Yearly by day'; + RSYearlyByDate = 'Yearly by date'; RSCustom = 'Custom'; RSMinutes = 'Minutes'; RSHours = 'Hours'; @@ -127,13 +127,25 @@ resourcestring RSYears = 'Years'; RSCalendarWeekAbbr = 'CW'; // Abbreviation of "calendar week" + RSToday = 'Today'; + RSTomorrow = 'Tomorrow'; + RSNextDay = 'Next day'; + RSNextWeek = 'Next week'; + RSNextMonth = 'Next month'; + RSNextYear = 'Next year'; + RSYesterday = 'Yesterday'; + RSPrevDay = 'Previous day'; + RSPrevWeek = 'Previous week'; + RSPrevMonth = 'Previous month'; + RSPrevYear = 'Previous year'; + {WARNINGS} RSPermanent = 'This operation cannot be undone!'; {Contact Specific} - RSContactPopupAdd = 'Add Contact...'; - RSContactPopupEdit = 'Edit Contact...'; - RSContactPopupDelete = 'Delete Contact...'; + RSContactPopupAdd = 'Add contact...'; + RSContactPopupEdit = 'Edit contact...'; + RSContactPopupDelete = 'Delete contact...'; RSConfirmDeleteContact = 'Delete contact %s?'; {Event Specific} @@ -145,31 +157,33 @@ resourcestring {Task Specific} RSConfirmDeleteTask = 'Delete this task from your list?'; - RSTaskPopupAdd = 'Add Task...'; - RSTaskPopupEdit = 'Edit Task...'; - RSTaskPopupDelete = 'Delete Task...'; - RSTaskTitleResource = 'Task List - '; {!!.01} - RSTaskTitleNoResource = 'Task List'; {!!.01} + RSTaskPopupAdd = 'Add task...'; + RSTaskPopupEdit = 'Edit task...'; + RSTaskPopupDelete = 'Delete task...'; + RSTaskTitleResource = 'Task list - '; {!!.01} + RSTaskTitleNoResource = 'Task list'; {!!.01} - {Month Specific} + {MonthView Specific} + (* RSMonthPopupToday = 'Today'; - RSMonthPopupNextMonth = 'Next Month'; - RSMonthPopupPrevMonth = 'Previous Month'; - RSMonthPopupNextYear = 'Next Year'; - RSMonthPopupPrevYear = 'Previous Year'; + RSMonthPopupNextMonth = 'Next month'; + RSMonthPopupPrevMonth = 'Previous month'; + RSMonthPopupNextYear = 'Next year'; + RSMonthPopupPrevYear = 'Previous year'; *) - {Week Specific} - RSWeekPopupAdd = 'Add Event...'; - RSWeekPopupEdit = 'Edit Event...'; - RSWeekPopupDelete = '&Delete Event...'; - RSWeekPopupNav = 'Change Date'; + {WeekView Specific} + RSWeekPopupAdd = 'Add event...'; + RSWeekPopupEdit = 'Edit event...'; + RSWeekPopupDelete = '&Delete event...'; + RSWeekPopupNav = 'Change date'; + (* RSWeekPopupNavToday = 'Today'; - RSWeekPopupNavNextWeek = 'Next Week'; - RSWeekPopupNavPrevWeek = 'Previous Week'; - RSWeekPopupNavNextMonth = 'Next Month'; - RSWeekPopupNavPrevMonth = 'Previous Month'; - RSWeekPopupNavNextYear = 'Next Year'; - RSWeekPopupNavPrevYear = 'Previous Year'; + RSWeekPopupNavNextWeek = 'Next week'; + RSWeekPopupNavPrevWeek = 'Previous week'; + RSWeekPopupNavNextMonth = 'Next month'; + RSWeekPopupNavPrevMonth = 'Previous month'; + RSWeekPopupNavNextYear = 'Next year'; + RSWeekPopupNavPrevYear = 'Previous year';*) { Print Preview Specific } RSPrintPrvPrint = '&Print'; @@ -186,21 +200,22 @@ resourcestring RSPrintPrvCancelHint = 'Cancel preview'; { DayView Specific } - RSDayPopupAdd = 'Add Event...'; - RSDayPopupEdit = 'Edit Event...'; - RSDayPopupDelete = 'Delete Event...'; - RSDayPopupNav = 'Change Date'; + RSDayPopupAdd = 'Add event...'; + RSDayPopupEdit = 'Edit event...'; + RSDayPopupDelete = 'Delete event...'; + RSDayPopupNav = 'Change date'; + (* RSDayPopupNavToday = 'Today'; RSDayPopupNavTomorrow = 'Tomorrow'; RSDayPopupNavYesterday = 'Yesterday'; - RSDayPopupNavNextDay = 'Next Day'; - RSDayPopupNavPrevDay = 'Previous Day'; - RSDayPopupNavNextWeek = 'Next Week'; - RSDayPopupNavPrevWeek = 'Previous Week'; - RSDayPopupNavNextMonth = 'Next Month'; - RSDayPopupNavPrevMonth = 'Previous Month'; - RSDayPopupNavNextYear = 'Next Year'; - RSDayPopupNavPrevYear = 'Previous Year'; + RSDayPopupNavNextDay = 'Next day'; + RSDayPopupNavPrevDay = 'Previous day'; + RSDayPopupNavNextWeek = 'Next week'; + RSDayPopupNavPrevWeek = 'Previous week'; + RSDayPopupNavNextMonth = 'Next month'; + RSDayPopupNavPrevMonth = 'Previous month'; + RSDayPopupNavNextYear = 'Next year'; + RSDayPopupNavPrevYear = 'Previous year'; RSHintToday = 'Today'; {!!.01} RSHintTomorrow = 'Tomorrow'; {!!.01} RSHintYesterday = 'Yesterday'; {!!.01} @@ -208,6 +223,7 @@ resourcestring RSHintPrevWeek = 'Previous week'; {!!.01} RSHintPrevDay = 'Previous day'; RsHintNextDay = 'Next day'; + *) RSPopupResourceGroups = 'Overlay events'; { field names } @@ -301,18 +317,20 @@ resourcestring RS1Week = '1 week'; { Calendar } + (* RSCalendarPrevMonth = 'Previous Month'; RSCalendarNextMonth = 'Next Month'; RSCalendarPrevYear = 'Previous Year'; RSCalendarNextYear = 'Next Year'; RSCalendarToday = 'Today'; - RSCalendarRevert = 'Revert'; RSCalendarPopupToday = 'Today'; RSCalendarPopupNextMonth = 'Next Month'; RSCalendarPopupPrevMonth = 'Previous Month'; RSCalendarPopupNextYear = 'Next Year'; RSCalendarPopupPrevYear = 'Previous Year'; + *) + RSCalendarRevert = 'Revert'; RSCalendarPopupRevert = 'Revert'; { XML } diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas index 3c5377960..f26e052aa 100644 --- a/components/tvplanit/source/vpweekview.pas +++ b/components/tvplanit/source/vpweekview.pas @@ -946,57 +946,69 @@ begin NewItem.Tag := 0; FDefaultPopup.Items.Add(NewItem); - if RSWeekPopupNavToday <> '' then begin + if RSToday <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSWeekPopupNavToday; + NewSubItem.Caption := RSToday; NewSubItem.OnClick := PopupToday; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSWeekPopupNavNextWeek <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSNextWeek <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSWeekPopupNavNextWeek; + NewSubItem.Caption := RSNextWeek; NewSubItem.OnClick := PopupNextWeek; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSWeekPopupNavPrevWeek <> '' then begin + if RSPrevWeek <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSWeekPopupNavPrevWeek; + NewSubItem.Caption := RSPrevWeek; NewSubItem.OnClick := PopupPrevWeek; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSWeekPopupNavNextMonth <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSNextMonth <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSWeekPopupNavNextMonth; + NewSubItem.Caption := RSNextMonth; NewSubItem.OnClick := PopupNextMonth; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSWeekPopupNavPrevMonth <> '' then begin + if RSPrevMonth <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSWeekPopupNavPrevMonth; + NewSubItem.Caption := RSPrevMonth; NewSubItem.OnClick := PopupPrevMonth; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSWeekPopupNavNextYear <> '' then begin + NewSubItem := TMenuItem.Create(Self); + NewSubItem.Caption := '-'; + NewItem.Add(NewSubItem); + + if RSNextYear <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSWeekPopupNavNextYear; + NewSubItem.Caption := RSNextYear; NewSubItem.OnClick := PopupNextYear; NewSubItem.Tag := 0; NewItem.Add(NewSubItem); end; - if RSWeekPopupNavPrevYear <> '' then begin + if RSPrevYear <> '' then begin NewSubItem := TMenuItem.Create(Self); - NewSubItem.Caption := RSWeekPopupNavPrevYear; + NewSubItem.Caption := RSPrevYear; NewSubItem.OnClick := PopupPrevYear; NewSubItem.Tag := 0; NewItem.Add(NewSubItem);