diff --git a/HISTORY b/HISTORY
index fe6e34aa..a5d3e7c3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5607,3 +5607,5 @@ Video Disk Recorder Revision History
   to avoid unnecessary OSD access (thanks to Marco Schlüßler).
 - The free disk space is now also displayed in the title of the "Recordings"
   menu (suggested by Walter Koch).
+- Changed the message "Upcoming VPS recording!" to "Upcoming recording!" because
+  it applies to non-VPS recordings as well.
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c74dc3f7..02855b79 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -973,7 +973,7 @@ msgstr "Dissabte"
 msgid "Sunday"
 msgstr "Diumenge"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 9f1f6cbc..0d7c197f 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -971,8 +971,8 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Nedìle"
 
-msgid "Upcoming VPS recording!"
-msgstr "Brzo zaène nahrávání VPS!"
+msgid "Upcoming recording!"
+msgstr "Brzo zaène nahrávání!"
 
 msgid "Recording started"
 msgstr "Zaèalo nahrávání"
diff --git a/po/da_DK.po b/po/da_DK.po
index 64b1ca54..8e6ac960 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -971,8 +971,8 @@ msgstr "L
 msgid "Sunday"
 msgstr "Søndag"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS optagelse starter snart!"
+msgid "Upcoming recording!"
+msgstr "Optagelse starter snart!"
 
 msgid "Recording started"
 msgstr "Optagelse startet"
diff --git a/po/de_DE.po b/po/de_DE.po
index 0eb33a0b..035b0198 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -971,8 +971,8 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-Aufnahme beginnt in Kürze!"
+msgid "Upcoming recording!"
+msgstr "Aufnahme beginnt in Kürze!"
 
 msgid "Recording started"
 msgstr "Aufzeichnung gestartet"
diff --git a/po/el_GR.po b/po/el_GR.po
index e8e48dcc..59d9f431 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -971,7 +971,7 @@ msgstr "
 msgid "Sunday"
 msgstr "ÊõñéáêÞ"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/es_ES.po b/po/es_ES.po
index 620eaed9..a470a72b 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -971,7 +971,7 @@ msgstr "S
 msgid "Sunday"
 msgstr "Domingo"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/et_EE.po b/po/et_EE.po
index 21be591f..f7477dd2 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -971,8 +971,8 @@ msgstr "Laup
 msgid "Sunday"
 msgstr "Pühapäev"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS salvestamine tulekul!"
+msgid "Upcoming recording!"
+msgstr "Salvestamine tulekul!"
 
 msgid "Recording started"
 msgstr "Salvestamine algas"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 82d5062b..8a7e75a8 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -974,8 +974,8 @@ msgstr "Lauantai"
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-tallennus on alkamassa!"
+msgid "Upcoming recording!"
+msgstr "Tallennus on alkamassa!"
 
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 8d8b406a..8bf2ca0c 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -977,8 +977,8 @@ msgstr "Samedi"
 msgid "Sunday"
 msgstr "Dimanche"
 
-msgid "Upcoming VPS recording!"
-msgstr "Enregistrement VPS commence prochaînement"
+msgid "Upcoming recording!"
+msgstr "Enregistrement commence prochaînement"
 
 msgid "Recording started"
 msgstr "Enregistrement a commencé"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 24186b97..14e456d0 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -972,7 +972,7 @@ msgstr "Subota"
 msgid "Sunday"
 msgstr "Nedjelja"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 49327784..5d10fe9d 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -975,8 +975,8 @@ msgstr "Szombat"
 msgid "Sunday"
 msgstr "Vasárnap"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-felvétel rögtön kezdõdik!"
+msgid "Upcoming recording!"
+msgstr "Felvétel rögtön kezdõdik!"
 
 msgid "Recording started"
 msgstr "A felvétel elindítva"
diff --git a/po/it_IT.po b/po/it_IT.po
index e9b4ea63..413a8d15 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -974,8 +974,8 @@ msgstr "Sabato"
 msgid "Sunday"
 msgstr "Domenica"
 
-msgid "Upcoming VPS recording!"
-msgstr "Registrazione VPS imminente!"
+msgid "Upcoming recording!"
+msgstr "Registrazione imminente!"
 
 msgid "Recording started"
 msgstr "Registrazione avviata"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index b603904f..59deeefe 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -973,7 +973,7 @@ msgstr "Zaterdag"
 msgid "Sunday"
 msgstr "Zondag"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 0355f0d7..56dd1695 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -972,7 +972,7 @@ msgstr "L
 msgid "Sunday"
 msgstr "Søndag"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 0bed63b5..319ba76b 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -971,8 +971,8 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Niedziela"
 
-msgid "Upcoming VPS recording!"
-msgstr "Wkrótce nagranie VPS!"
+msgid "Upcoming recording!"
+msgstr "Wkrótce nagranie!"
 
 msgid "Recording started"
 msgstr "Rozpoczêto nagrywanie"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 3a2915ec..e33bfb4e 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -971,7 +971,7 @@ msgstr "S
 msgid "Sunday"
 msgstr "Domingo"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index e468698d..0a5bc5a1 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -972,8 +972,8 @@ msgstr "S
 msgid "Sunday"
 msgstr "Duminicã"
 
-msgid "Upcoming VPS recording!"
-msgstr "Urmeazã o înregistrare VPS!"
+msgid "Upcoming recording!"
+msgstr "Urmeazã o înregistrare!"
 
 msgid "Recording started"
 msgstr "A început înregistrarea"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2f9b40cf..be7ae836 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -972,8 +972,8 @@ msgstr "
 msgid "Sunday"
 msgstr "²ÞáÚàÕáÕÝìÕ"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-·ÐßØáì áÚÞàÞ ÝÐçÝÕâáï"
+msgid "Upcoming recording!"
+msgstr "·ÐßØáì áÚÞàÞ ÝÐçÝÕâáï"
 
 msgid "Recording started"
 msgstr "·ÐßØáì ÝÐçÐâÐ"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index f3f1fe5b..6f591bb2 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -972,8 +972,8 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Nedelja"
 
-msgid "Upcoming VPS recording!"
-msgstr "Sledi VPS snemanje!"
+msgid "Upcoming recording!"
+msgstr "Sledi snemanje!"
 
 msgid "Recording started"
 msgstr "Snemanje se je prièelo"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e994e776..1adebd78 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -972,8 +972,8 @@ msgstr "L
 msgid "Sunday"
 msgstr "Söndag"
 
-msgid "Upcoming VPS recording!"
-msgstr "strax VPS inspelning..."
+msgid "Upcoming recording!"
+msgstr "strax inspelning..."
 
 msgid "Recording started"
 msgstr "Inspelningen har startat"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 2e81d91a..c886683f 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -971,8 +971,8 @@ msgstr "Cumartesi"
 msgid "Sunday"
 msgstr "Pazar"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS çekim yakýnda baþlýyor!"
+msgid "Upcoming recording!"
+msgstr "Çekim yakýnda baþlýyor!"
 
 msgid "Recording started"
 msgstr "Kayýt baþlandý"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index fd13c0ed..96f4ec85 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -973,8 +973,8 @@ msgstr "
 msgid "Sunday"
 msgstr "½ÕÔöÛï"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-·ÐßØá áÚÞàÞ ßÞçÝÕâìáï"
+msgid "Upcoming recording!"
+msgstr "·ÐßØá áÚÞàÞ ßÞçÝÕâìáï"
 
 msgid "Recording started"
 msgstr "·ÐßØá ßÞçÐÒáï"
diff --git a/vdr.c b/vdr.c
index 0bd5416c..444d3c66 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.308 2008/02/08 15:55:30 kls Exp $
+ * $Id: vdr.c 1.309 2008/02/10 11:53:29 kls Exp $
  */
 
 #include <getopt.h>
@@ -878,7 +878,7 @@ int main(int argc, char *argv[])
                         if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
                            // the previous SwitchChannel() has switched away the current live channel
                            Channels.SwitchTo(Timer->Channel()->Number()); // avoids toggling between old channel and black screen
-                           Skins.Message(mtInfo, tr("Upcoming VPS recording!"));
+                           Skins.Message(mtInfo, tr("Upcoming recording!"));
                            }
                         }
                      }