diff --git a/components/tvplanit/examples/fulldemo/demomain.lfm b/components/tvplanit/examples/fulldemo/demomain.lfm
index c43bb77d3..9067597cc 100644
--- a/components/tvplanit/examples/fulldemo/demomain.lfm
+++ b/components/tvplanit/examples/fulldemo/demomain.lfm
@@ -46,6 +46,7 @@ object MainForm: TMainForm
         Top = 8
         Width = 84
         Caption = 'TitleLbl'
+        Color = clDefault
         Font.Color = clWhite
         Font.Height = -24
         Font.Style = [fsBold]
@@ -224,6 +225,7 @@ object MainForm: TMainForm
               BorderSpacing.Top = 4
               BorderSpacing.Bottom = 4
               Caption = 'Visible days'
+              Color = clDefault
               ParentColor = False
             end
             object DaysTrackBar: TTrackBar
@@ -286,6 +288,7 @@ object MainForm: TMainForm
               BorderSpacing.Top = 4
               BorderSpacing.Bottom = 4
               Caption = 'Granularity'
+              Color = clDefault
               ParentColor = False
             end
           end
@@ -519,6 +522,7 @@ object MainForm: TMainForm
           Width = 299
           BorderSpacing.Top = 24
           Caption = 'Check the resource to be overlaid to the current resource'
+          Color = clDefault
           ParentColor = False
         end
         object lblResources: TLabel
@@ -531,6 +535,7 @@ object MainForm: TMainForm
           BorderSpacing.Left = 16
           BorderSpacing.Top = 24
           Caption = 'Resources (the selected resource will be displayed)'
+          Color = clDefault
           ParentColor = False
         end
       end
@@ -546,6 +551,7 @@ object MainForm: TMainForm
           Anchors = [akTop, akRight]
           BorderSpacing.Right = 8
           Caption = 'Language'
+          Color = clDefault
           ParentColor = False
         end
         object CbLanguages: TComboBox
@@ -586,6 +592,7 @@ object MainForm: TMainForm
           Anchors = [akTop, akRight]
           BorderSpacing.Right = 8
           Caption = 'Drawing style:'
+          Color = clDefault
           ParentColor = False
         end
         object CbAddressBuilder: TComboBox
@@ -621,6 +628,7 @@ object MainForm: TMainForm
           Anchors = [akTop, akRight]
           BorderSpacing.Right = 8
           Caption = 'Address builder'
+          Color = clDefault
           ParentColor = False
         end
         object CbAllowInplaceEditing: TCheckBox
@@ -664,6 +672,7 @@ object MainForm: TMainForm
           Anchors = [akTop, akRight]
           BorderSpacing.Right = 8
           Caption = 'First day of week'
+          Color = clDefault
           ParentColor = False
         end
         object CbTimeFormat: TComboBox
@@ -691,6 +700,7 @@ object MainForm: TMainForm
           Anchors = [akTop, akRight]
           BorderSpacing.Right = 8
           Caption = 'Time format'
+          Color = clDefault
           ParentColor = False
         end
         object CbAllowDragAndDrop: TCheckBox
diff --git a/components/tvplanit/examples/fulldemo/demomain.pas b/components/tvplanit/examples/fulldemo/demomain.pas
index 0edd7e0b0..e404675c9 100644
--- a/components/tvplanit/examples/fulldemo/demomain.pas
+++ b/components/tvplanit/examples/fulldemo/demomain.pas
@@ -967,10 +967,12 @@ begin
   langdir := AppendPathDelim(GetLanguageDir);
 
   // Select new language
-  if ALang = 'en' then
-    FLang := '' else
+  if ALang = '' then
+    FLang := 'en'
+  else
     FLang := ALang;
 
+    (*
   if FLang = '' then begin
     // Translate VisualPlanIt strings.
     TranslateUnitResourceStrings('vpsr', langdir + 'vpsr.po');
@@ -995,9 +997,10 @@ begin
   end
   else
   begin
+  *)
     SetDefaultLang(FLang, langdir);
-    TranslateUnitResourceStrings('vpsr', langdir + 'vpsr.' + FLang + '.po');
-  end;
+    //TranslateUnitResourceStrings('vpsr', langdir + 'vpsr.' + FLang + '.po');
+  //end;
                         {
   VpDayView1.LoadLanguage;
   VpWeekView1.LoadLanguage;
@@ -1007,7 +1010,6 @@ begin
   //VpCalendar1.LoadLanguage;
                          }
   // Select language in language combobox.
-  if ALang = '' then ALang := 'en';
   found := false;
   for i:=0 to CbLanguages.Items.Count-1 do
     if pos(ALang + ' ', CbLanguages.Items[i]) = 1 then begin
diff --git a/components/tvplanit/languages/demo.pl.po b/components/tvplanit/languages/demo.pl.po
new file mode 100644
index 000000000..efd2604ee
--- /dev/null
+++ b/components/tvplanit/languages/demo.pl.po
@@ -0,0 +1,284 @@
+Granimsgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.1\n"
+
+#: demomain.rs10min
+msgid "10 min"
+msgstr "10 min"
+
+#: demomain.rs12hours
+msgctxt "demomain.rs12hours"
+msgid "12 hours AM/PM"
+msgstr "12 godz. AM/PM"
+
+#: demomain.rs15min
+msgid "15 min"
+msgstr "15 min"
+
+#: demomain.rs20min
+msgid "20 min"
+msgstr "20 min"
+
+#: demomain.rs24hours
+msgid "24 hours"
+msgstr "24 godziny"
+
+#: demomain.rs30min
+msgid "30 min"
+msgstr "30 min"
+
+#: demomain.rs3d
+msgid "3D"
+msgstr "3D"
+
+#: demomain.rs5min
+msgid "5 min"
+msgstr "5 min"
+
+#: demomain.rs60min
+msgid "60 min"
+msgstr "60 min"
+
+#: demomain.rs6min
+msgid "6 min"
+msgstr "6 min"
+
+#: demomain.rsborderless
+msgid "no border"
+msgstr "bez ramki"
+
+#: demomain.rsconfirmdeleteres
+#, object-pascal-format
+msgid "Do you really want to delete resource %s?"
+msgstr "Czy naprawdę chcesz skasować zasób %s?"
+
+#: demomain.rscontacts
+msgctxt "demomain.rscontacts"
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: demomain.rseventsoverview
+msgid "Events overview"
+msgstr "Przegląd wydarzeń"
+
+#: demomain.rseventsperday
+msgid "Events per day"
+msgstr "Zdarzenia wg dnia"
+
+#: demomain.rseventspermonth
+msgid "Events per month"
+msgstr "Zdarzenia wg miesiąca"
+
+#: demomain.rseventsperweek
+msgid "Events per week"
+msgstr "Zdarzenia wg tygodnia"
+
+#: demomain.rsflat
+msgid "flat"
+msgstr "płaskie"
+
+#: demomain.rsfriday
+msgid "Friday"
+msgstr "Piątek"
+
+#: demomain.rsmaintenance
+msgctxt "demomain.rsmaintenance"
+msgid "Maintenance"
+msgstr "Ustawienia"
+
+#: demomain.rsmonday
+msgid "Monday"
+msgstr "Poniedziałek"
+
+#: demomain.rsplanner
+msgid "Planner"
+msgstr "Planer"
+
+#: demomain.rsresources
+msgctxt "demomain.rsresources"
+msgid "Resources"
+msgstr "Zasoby"
+
+#: demomain.rssaturday
+msgid "Saturday"
+msgstr "Sobota"
+
+#: demomain.rssettings
+msgid "Program settings"
+msgstr "Ustawienia ogólne"
+
+#: demomain.rssettings_short
+msgctxt "demomain.rssettings_short"
+msgid "Settings"
+msgstr "Ustawienia ogólne"
+
+#: demomain.rssunday
+msgid "Sunday"
+msgstr "Niedziela"
+
+#: demomain.rstasks
+msgctxt "demomain.rstasks"
+msgid "Tasks"
+msgstr "Zadania"
+
+#: demomain.rsthursday
+msgid "Thursday"
+msgstr "Czwartek"
+
+#: demomain.rstuesday
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#: demomain.rswednesday
+msgid "Wednesday"
+msgstr "Środa"
+
+#: demomain.rsxmlfiles
+msgid "XML files (*.xml)"
+msgstr "Plik XML (*.XML)"
+
+#: tmainform.btndeleteres.caption
+msgid "Delete"
+msgstr "Usuń"
+
+#: tmainform.btneditres.caption
+msgid "Edit"
+msgstr "Edytuj"
+
+#: tmainform.btnnewres.caption
+msgid "New"
+msgstr "Dodaj"
+
+#: tmainform.caption
+msgid "Turbo Power VisualPlanIt Demo"
+msgstr "Turbo Power VisualPlanIt Demo"
+
+#: tmainform.cbaddressbuilder.text
+msgid "(default)"
+msgstr "(domyślny)"
+
+#: tmainform.cballowdraganddrop.caption
+msgid "Allow drag and drop of events"
+msgstr "Pozwól na drag and drop wydarzeń"
+
+#: tmainform.cballowinplaceediting.caption
+msgid "Allow inplace editing"
+msgstr "Pozwól na bezpośrednią edycję"
+
+#: tmainform.cbdragdroptransparent.caption
+msgid "Transparent drag and drop"
+msgstr "Przeźroczyste tło podczas drag and drop"
+
+#: tmainform.cbgranularity.text
+msgid "30 Min"
+msgstr "30 min"
+
+#: tmainform.cbshoweventhints.caption
+msgid "Show event and contact hints"
+msgstr "Pokaż podpowiedzi dla wydarzeń i kontaktów"
+
+#: tmainform.lbladdressbuilder.caption
+msgid "Address builder"
+msgstr "Generator adresów"
+
+#: tmainform.lbldrawingstyle.caption
+msgid "Drawing style:"
+msgstr "Styl rysowania:"
+
+#: tmainform.lblfirstdayofweek.caption
+msgid "First day of week"
+msgstr "Pierwszy dzień tygodnia"
+
+#: tmainform.lblgranularity.caption
+msgid "Granularity"
+msgstr "Dokładność"
+
+#: tmainform.lbllanguage.caption
+msgid "Language"
+msgstr "Język"
+
+#: tmainform.lblotherresources.caption
+msgctxt "tmainform.lblotherresources.caption"
+msgid "Check the resource to be overlaid to the current resource"
+msgstr "Zaznacz zasób, który ma zostać nałożony na bieżący zasób"
+
+#: tmainform.lblresources.caption
+msgctxt "tmainform.lblresources.caption"
+msgid "Resources (the selected resource will be displayed)"
+msgstr "Zasoby (wybrany będzie wyświetlony)"
+
+#: tmainform.lbltimeformat.caption
+msgid "Time format"
+msgstr "Format czasu"
+
+#: tmainform.lblvisibledays.caption
+msgid "Visible days"
+msgstr "Widoczny zakres dni"
+
+#: tmainform.menuitem1.caption
+msgid "File"
+msgstr "Plik"
+
+#: tmainform.menuitem2.caption
+msgid "Help"
+msgstr "Pomoc"
+
+#: tmainform.mnuabout.caption
+msgid "About Visual PlanIt"
+msgstr "O Visual PlanIt"
+
+#: tmainform.mnueditprintformats.caption
+msgid "Edit print formats..."
+msgstr "Edytuj format wydruku..."
+
+#: tmainform.mnuloadprintformats.caption
+msgid "Load print formats..."
+msgstr "Załaduj format wydruku..."
+
+#: tmainform.mnumaintenance.caption
+msgctxt "tmainform.mnumaintenance.caption"
+msgid "Maintenance"
+msgstr "Ustawienia"
+
+#: tmainform.mnuprint.caption
+msgid "Print..."
+msgstr "Drukuj..."
+
+#: tmainform.mnuprintpreview.caption
+msgid "Print preview..."
+msgstr "Podgląd wydruku..."
+
+#: tmainform.mnuquit.caption
+msgid "Quit"
+msgstr "Wyjście"
+
+#: tmainform.mnuresources.caption
+msgctxt "tmainform.mnuresources.caption"
+msgid "Resources"
+msgstr "Zasoby"
+
+#: tmainform.mnusettings.caption
+msgctxt "tmainform.mnusettings.caption"
+msgid "Settings"
+msgstr "Ustawienia ogólne"
+
+#: tmainform.rballtasks.caption
+msgid "All tasks"
+msgstr "Wszystkie zadania"
+
+#: tmainform.rbhidecompletedtasks.caption
+msgid "Hide completed tasks"
+msgstr "Ukryj wykonane zadania"
+
+#: tmainform.titlelbl.caption
+msgid "TitleLbl"
+msgstr ""