diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 92e5895e..5444ddd5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -696,6 +696,7 @@ Oliver Endriss <o.endriss@gmx.de>
  Makefile
  for helping to debug a problem with reduced number of retries in Transfer Mode on
  SD-FF cards
+ for reporting a problem with resuming replay of PES recordings
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1059,7 +1060,7 @@ Lars Bl
 Niko Tarnanen <niko.tarnanen@hut.fi>
  for translating OSD texts to the Finnish language
 
-Rolf Ahrenberg <rahrenbe@cc.hut.fi>
+Rolf Ahrenberg <Rolf.Ahrenberg@saunalahti.fi>
  for translating OSD texts to the Finnish language
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
  for making pressing the Power button not stop Transfer Mode or replay immediately
@@ -1159,6 +1160,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for fixing reduced bpp support for DVB subtitles
  for implementing "DVB Standard compliance" handling
  for fixing the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel()
+ for a patch that was used to rename the "plp id" to a more general "stream id"
+ and add support for DVB-S2 "Input Stream Identifier" (ISI)
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1919,6 +1922,7 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
  for pointing out a possible problem with asprintf() if the return value is not
  checked
  for fixing setting the OSD level in the 'osddemo' example
+ for pointing out a missing statement about the new default sort order of recordings
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
@@ -2693,7 +2697,7 @@ Alexander Gross <Bikalexander@gmail.com>
 Adrian Caval <anrxc@sysphere.org>
  for translating OSD texts to the Croatian language
 
-Nan Feng <nfgx@21cn.com>
+Nan Feng <nfvdr@live.com>
  for translating OSD texts to the Chinese language
 
 Edgar Toernig <froese@gmx.de>
@@ -2789,7 +2793,7 @@ Rene van den Braken <rene@vandenbraken.name>
  cPatPmtGenerator::GeneratePmt()
 
 Milan Hrala <hrala.milan@gmail.com>
- for translating OSD texts to the Slovakian language
+ for translating OSD texts to the Slovak language
 
 Andreas Schaefers <andreas_schaefers@gmx.de>
  for adding the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()
@@ -2825,6 +2829,8 @@ Alex Lasnier <alex@fepg.org>
 
 Dimitar Petrovski <dimeptr@gmail.com>
  for translating OSD texts to the Macedonian language
+ for pointing out a missing character set in the header of HTML pages generated by
+ the epg2html script
 
 Eric Valette <eric.valette@free.fr>
  for adding handling of EnhancedAC3DescriptorTag
@@ -2863,7 +2869,7 @@ Cristiano A. Silva <arquithek@gmail.com>
 
 Osama Alrawab <alrawab@hotmail.com>
  for adding support for languages that are written right-to-left
- for translating OSD texts to the Arabian language
+ for translating OSD texts to the Arabic language
 
 Antti Sepp�l� <a.seppala@gmail.com>
  for suggesting to add cString::operator=(const char *String)
@@ -3074,6 +3080,7 @@ Stefan Blochberger <Stefan.Blochberger@gmx.de>
 
 Cedric Dewijs <cedric.dewijs@telfort.nl>
  for adding maximum SNR value for PCTV Systems PCTV 73ESE
+ for translating OSD texts to the Dutch language
 
 Stefan Stolz <st.stolz@gmail.com>
  for suggesting to make the SVDRP command LSTR optionally list the actual file name of
@@ -3099,3 +3106,9 @@ Matthias Senzel <matthias.senzel@t-online.de>
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
+
+Dominique Plu <dplu@free.fr>
+ for translating OSD texts to the French language
+
+Matti Lehtim�ki <matti.lehtimaki@gmail.com>
+ for translating OSD texts to the Finnish language
diff --git a/HISTORY b/HISTORY
index 06daf6f8..763140e2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6176,7 +6176,7 @@ Video Disk Recorder Revision History
   is not detectable from the first TS packet of a frame.
 - Fixed writing the PCR pid into the PMT in cPatPmtGenerator::GeneratePmt()
   (reported by Rene van den Braken).
-- Added Slovakian language texts (thanks to Milan Hrala).
+- Added Slovak language texts (thanks to Milan Hrala).
 - Fixed EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0 (thanks
   to Frank Schmirler).
 - Fixed starting a recording at an I-frame.
@@ -6479,7 +6479,7 @@ Video Disk Recorder Revision History
 - Fixed following symbolic links in RemoveFileOrDir().
 - Added support for languages that are written right-to-left (based on a patch
   from Osama Alrawab). See INSTALL for information on how to turn this on.
-- Added Arabian language texts (thanks to Osama Alrawab).
+- Added Arabic language texts (thanks to Osama Alrawab).
 
 2011-03-12: Version 1.7.17
 
@@ -6533,7 +6533,7 @@ Video Disk Recorder Revision History
   TrueColor OSD if it is run on a system that actually provides TrueColor support.
   Thanks to Reinhard Nissl for some valuable input, help with debugging, and an
   implementation of the AlphaBlend() function.
-- Updated the Slovakian language texts (thanks to Milan Hrala).
+- Updated the Slovak language texts (thanks to Milan Hrala).
 - Added Serbian language texts (thanks to Milan Cvijanovic).
 - Fixed reallocating memory in the "pictures" plugin (reported by Paul Menzel, with
   input from Oliver Endriss).
@@ -7175,6 +7175,10 @@ Video Disk Recorder Revision History
   folder (provided you have write access to that folder).
   If a folder is newly created by a repeating timer, the sort mode for that
   folder is initially set to "by time".
+  Note that in previous versions the default sort order of the top level video
+  directory was "by name" and all subdirectories were sorted "by time". Now the
+  default sort order for all directories is "by name", so if you have an existing
+  folder that shall be sorted "by time", press the '0' key once to achieve this.
 - Fixed several spelling errors (thanks to Ville Skytt�).
 - Fixed handling recording with more than two bonded devices.
 - Fixed the type of MBperMinute in cVideoDiskUsage::HasChanged() (thanks to Andreas
@@ -7556,7 +7560,7 @@ Video Disk Recorder Revision History
 - Changed several calls to Skins.Message() in vdr.c to Skins.QueueMessage() in order to
   avoid a black screen while such a message is displayed in case the channel will be
   switched (reported by Uwe Scheffler).
-- Updated the Slovakian language texts (thanks to Milan Hrala).
+- Updated the Slovak language texts (thanks to Milan Hrala).
 - Improved LIRC timing for repeat function.
 - When pausing live video, the current audio and subtitle tracks are now retained.
 - Added some notes about plugin Makefiles to PLUGINS.html.
@@ -7684,3 +7688,44 @@ Video Disk Recorder Revision History
   immediately.
 - When sorting recordings by name, folders are now always at the top of the list.
 - Updated the Russian OSD texts (thanks to Oleg Roitburd).
+
+2013-03-10: Version 1.7.40
+
+- The "Recording info" page of the skins that come with VDR now displays the name of
+  the channel (if available) from which this recording was taken.
+- Updated the Catalan OSD texts (thanks to Luca Olivetti).
+- Updated the Spanish OSD texts (thanks to Luca Olivetti).
+- Added a note about the new default sort order of recordings to the release notes of
+  version 1.7.29 and the UPDATE-2.0.0 file (pointed out by Wolfgang Rohdewald).
+- Fixed a faulty UTF-8 character in cs_CZ.po.
+- Added the system's character set to the page header in the epg2html script (pointed
+  out by Dimitar Petrovski).
+- Updated the Slovenian OSD texts (thanks to Matjaz Thaler).
+- The new option "Setup/OSD/Always sort folders first" can be used to control whether
+  folders will be always at the top of the Recordings menu, or will be interspersed
+  with plain recordings when sorted alphabetically.
+- Updated the Swedish OSD texts (thanks to Richard Lithvall).
+- Updated the Chinese OSD texts (thanks to Nan Feng).
+- Updated the Slovak OSD texts (thanks to Milan Hrala).
+- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
+- Updated the Dutch OSD texts (thanks to Cedric Dewijs).
+- Updated the Czech OSD texts (thanks to Ales Jurik).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Updated the French OSD texts (thanks to Dominique Plu).
+- Updated the Finnish OSD texts (thanks to Matti Lehtim�ki).
+- Updated the Arabic OSD texts (thanks to Osama Alrawab).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Renamed the "plp id" to a more general "stream id" and added support for DVB-S2
+  "Input Stream Identifier" (ISI) (based on a patch from Rolf Ahrenberg).
+  With this VDR now supports "multi streaming" on DVB-S2 and DVB-T2 transponders.
+- Fixed a possible deadlock when changing the audio track while replaying a recording.
+- Fixed resuming replay of PES recordings (reported by Oliver Endriss).
+- Limited the Goto() call in cDvbPlayer::SetAudioTrack() to the main thread, in order
+  to avoid a crash when the track is automatically set from the player thread.
+- The LCARS skin now calls SetAntiAliasGranularity(20, 16) in order to reserve enough
+  fixed colors on 8bpp displays with anti-aliasing.
+- Changed the default values for the OSD size back to those before version 1.7.29,
+  to avoid problems with SD-FF cards in case the user switches to the "ST:TNG" or
+  "Classic" skin.
diff --git a/MANUAL b/MANUAL
index 25261e3f..e1f79f85 100644
--- a/MANUAL
+++ b/MANUAL
@@ -601,6 +601,11 @@ Version 1.6
                          Controls whether the full folder path is shown in the
                          "Timers" menu, or just the basic recording name.
 
+  Always sort folders first = yes
+                         In the "Recordings" menu folders are always listed before
+                         plain recordings. Set this option to "no" if you want folders
+                         to be interspersed with recordings when sorted alphabetically.
+
   Number keys for characters = yes
                          Controls whether the number keys can be used to enter
                          characters in a text input field. You may want to set this
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 74a36dbe..53e70e81 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -109,3 +109,8 @@ VDR Plugin 'skincurses' Revision History
 2013-01-12: Version 0.1.14
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-03: Version 0.1.15
+
+- The "Recording info" page now displays the name of the channel (if available)
+  from which this recording was taken.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 2a9f042d..da9d17ae 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.11 2013/01/12 14:13:12 kls Exp $
+ * $Id: skincurses.c 2.12 2013/03/03 15:33:59 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "0.1.14";
+static const char *VERSION        = "0.1.15";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -447,8 +447,7 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
   const cRecordingInfo *Info = Recording->Info();
   int y = 2;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
index 3ed9db0b..0632bfba 100644
--- a/UPDATE-2.0.0
+++ b/UPDATE-2.0.0
@@ -194,6 +194,7 @@ Devices:
   handling of a CAM.
 - The new functions cDevice::CanScaleVideo() and cDevice::ScaleVideo() can be used by
   derived output devices to implement scaling the video to a given size and location.
+- Added support for DVB-S2 and DVB-T2 transponders that use "multi streaming".
 
 DiSEqC:
 
@@ -267,6 +268,10 @@ OSD:
   folder (provided you have write access to that folder).
   If a folder is newly created by a repeating timer, the sort mode for that
   folder is initially set to "by time".
+  Note that in previous versions the default sort order of the top level video
+  directory was "by name" and all subdirectories were sorted "by time". Now the
+  default sort order for all directories is "by name", so if you have an existing
+  folder that shall be sorted "by time", press the '0' key once to achieve this.
 - The new setup option "Miscellaneous/Show channel names with source" can be used to
   turn on adding the source character to channel names whenever they are displayed.
 - Pressing the Play key during normal live viewing mode now opens the Recordings menu
diff --git a/config.c b/config.c
index 2c87985a..3dc9fe84 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.35 2013/02/14 15:14:37 kls Exp $
+ * $Id: config.c 2.37 2013/03/10 14:56:51 kls Exp $
  */
 
 #include "config.h"
@@ -420,6 +420,7 @@ cSetup::cSetup(void)
   VpsMargin = 120;
   RecordingDirs = 1;
   FoldersInTimerMenu = 1;
+  AlwaysSortFoldersFirst = 1;
   NumberKeysForChars = 1;
   ColorKey0 = 0;
   ColorKey1 = 1;
@@ -431,10 +432,10 @@ cSetup::cSetup(void)
   UseDolbyDigital = 1;
   ChannelInfoPos = 0;
   ChannelInfoTime = 5;
-  OSDLeftP = 0.03;
-  OSDTopP = 0.03;
-  OSDWidthP = 0.93;
-  OSDHeightP = 0.93;
+  OSDLeftP = 0.08;
+  OSDTopP = 0.08;
+  OSDWidthP = 0.87;
+  OSDHeightP = 0.84;
   OSDLeft = 54;
   OSDTop = 45;
   OSDWidth = 624;
@@ -624,6 +625,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
+  else if (!strcasecmp(Name, "AlwaysSortFoldersFirst")) AlwaysSortFoldersFirst = atoi(Value);
   else if (!strcasecmp(Name, "NumberKeysForChars"))  NumberKeysForChars = atoi(Value);
   else if (!strcasecmp(Name, "ColorKey0"))           ColorKey0          = atoi(Value);
   else if (!strcasecmp(Name, "ColorKey1"))           ColorKey1          = atoi(Value);
@@ -732,6 +734,7 @@ bool cSetup::Save(void)
   Store("VpsMargin",          VpsMargin);
   Store("RecordingDirs",      RecordingDirs);
   Store("FoldersInTimerMenu", FoldersInTimerMenu);
+  Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst);
   Store("NumberKeysForChars", NumberKeysForChars);
   Store("ColorKey0",          ColorKey0);
   Store("ColorKey1",          ColorKey1);
diff --git a/config.h b/config.h
index a6ab9735..9d88d6c2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.69 2013/02/18 10:41:43 kls Exp $
+ * $Id: config.h 2.71 2013/03/04 13:58:40 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.39"
-#define VDRVERSNUM   10739  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.40"
+#define VDRVERSNUM   10740  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.39"
-#define APIVERSNUM   10739  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.40"
+#define APIVERSNUM   10740  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -293,6 +293,7 @@ public:
   int VpsMargin;
   int RecordingDirs;
   int FoldersInTimerMenu;
+  int AlwaysSortFoldersFirst;
   int NumberKeysForChars;
   int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
   int VideoDisplayFormat;
diff --git a/device.c b/device.c
index ca897b0f..ff51a115 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.73 2013/02/16 14:39:30 kls Exp $
+ * $Id: device.c 2.74 2013/03/07 13:18:35 kls Exp $
  */
 
 #include "device.h"
@@ -1290,7 +1290,6 @@ int cDevice::PlaySubtitle(const uchar *Data, int Length)
 
 int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 {
-  cMutexLock MutexLock(&mutexCurrentAudioTrack);
   bool FirstLoop = true;
   uchar c = Data[3];
   const uchar *Start = Data;
@@ -1468,7 +1467,7 @@ int cDevice::PlayTsSubtitle(const uchar *Data, int Length)
 int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 {
   int Played = 0;
-  if (Data == NULL) {
+  if (!Data) {
      tsToPesVideo.Reset();
      tsToPesAudio.Reset();
      tsToPesSubtitle.Reset();
@@ -1478,7 +1477,6 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
      return Length;
      }
   else {
-     cMutexLock MutexLock(&mutexCurrentAudioTrack);
      while (Length >= TS_SIZE) {
            if (Data[0] != TS_SYNC_BYTE) {
               int Skipped = 1;
diff --git a/dvbdevice.c b/dvbdevice.c
index 0a2f51a1..cd017a2d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.83 2013/02/20 09:12:12 kls Exp $
+ * $Id: dvbdevice.c 2.84 2013/03/07 09:42:29 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -23,6 +23,7 @@
 
 #if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0508
 #define DTV_STREAM_ID DTV_DVBT2_PLP_ID
+#define FE_CAN_MULTISTREAM 0x4000000
 #endif
 
 #define DVBS_TUNE_TIMEOUT  9000 //ms
@@ -207,7 +208,7 @@ cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
   guard        = GUARD_INTERVAL_AUTO;
   hierarchy    = HIERARCHY_AUTO;
   rollOff      = ROLLOFF_AUTO;
-  plpId        = 0;
+  streamId     = 0;
   Parse(Parameters);
 }
 
@@ -230,7 +231,7 @@ cString cDvbTransponderParameters::ToString(char Type) const
   ST("ACST*")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
   ST("ACST*")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
   ST("  S 2")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
-  ST("   T2")  q += PrintParameter(q, 'P', plpId);
+  ST("  ST2")  q += PrintParameter(q, 'P', streamId);
   ST("  ST*")  q += PrintParameter(q, 'S', MapToUser(system, SystemValuesSat)); // we only need the numerical value, so Sat or Terr doesn't matter
   ST("   T*")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
   ST("   T*")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
@@ -266,7 +267,7 @@ bool cDvbTransponderParameters::Parse(const char *s)
           case 'L': polarization = 'L'; s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
           case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
-          case 'P': s = ParseParameter(s, plpId); break;
+          case 'P': s = ParseParameter(s, streamId); break;
           case 'R': polarization = 'R'; s++; break;
           case 'S': s = ParseParameter(s, system, SystemValuesSat); break; // we only need the numerical value, so Sat or Terr doesn't matter
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
@@ -795,6 +796,7 @@ bool cDvbTuner::SetFrontend(void)
         // DVB-S2
         SETCMD(DTV_PILOT, PILOT_AUTO);
         SETCMD(DTV_ROLLOFF, dtp.RollOff());
+        SETCMD(DTV_STREAM_ID, dtp.StreamId());
         }
      else {
         // DVB-S
@@ -828,7 +830,7 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
      if (frontendType == SYS_DVBT2) {
         // DVB-T2
-        SETCMD(DTV_STREAM_ID, dtp.PlpId());
+        SETCMD(DTV_STREAM_ID, dtp.StreamId());
         }
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
@@ -968,7 +970,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
     case  9: ST("   T")  return new cMenuEditMapItem( tr("Guard"),        &dtp.guard,        GuardValues);        else return GetOsdItem();
     case 10: ST("   T")  return new cMenuEditMapItem( tr("Hierarchy"),    &dtp.hierarchy,    HierarchyValues);    else return GetOsdItem();
     case 11: ST("  S ")  return new cMenuEditMapItem( tr("Rolloff"),      &dtp.rollOff,      RollOffValues);      else return GetOsdItem();
-    case 12: ST("   T")  return new cMenuEditIntItem( tr("PlpId"),        &dtp.plpId,        0, 255);             else return GetOsdItem();
+    case 12: ST("  ST")  return new cMenuEditIntItem( tr("StreamId"),     &dtp.streamId,     0, 255);             else return GetOsdItem();
     default: return NULL;
     }
   return NULL;
@@ -1436,6 +1438,7 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
      return false; // doesn't provide source
   cDvbTransponderParameters dtp(Channel->Parameters());
   if (!ProvidesDeliverySystem(GetRequiredDeliverySystem(Channel, &dtp)) ||
+     dtp.StreamId()   != 0        && !(frontendInfo.caps & FE_CAN_MULTISTREAM) ||
      dtp.Modulation() == QPSK     && !(frontendInfo.caps & FE_CAN_QPSK) ||
      dtp.Modulation() == QAM_16   && !(frontendInfo.caps & FE_CAN_QAM_16) ||
      dtp.Modulation() == QAM_32   && !(frontendInfo.caps & FE_CAN_QAM_32) ||
diff --git a/dvbdevice.h b/dvbdevice.h
index 3674a615..b4d07f58 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.28 2013/02/16 15:20:17 kls Exp $
+ * $Id: dvbdevice.h 2.29 2013/03/07 09:42:29 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -69,7 +69,7 @@ private:
   int guard;
   int hierarchy;
   int rollOff;
-  int plpId;
+  int streamId;
   int PrintParameter(char *p, char Name, int Value) const;
   const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map = NULL);
 public:
@@ -85,7 +85,7 @@ public:
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
   int RollOff(void) const { return rollOff; }
-  int PlpId(void) const { return plpId; }
+  int StreamId(void) const { return streamId; }
   void SetPolarization(char Polarization) { polarization = Polarization; }
   void SetInversion(int Inversion) { inversion = Inversion; }
   void SetBandwidth(int Bandwidth) { bandwidth = Bandwidth; }
@@ -97,7 +97,7 @@ public:
   void SetGuard(int Guard) { guard = Guard; }
   void SetHierarchy(int Hierarchy) { hierarchy = Hierarchy; }
   void SetRollOff(int RollOff) { rollOff = RollOff; }
-  void SetPlpId(int PlpId) { plpId = PlpId; }
+  void SetStreamId(int StreamId) { streamId = StreamId; }
   cString ToString(char Type) const;
   bool Parse(const char *s);
   };
diff --git a/dvbplayer.c b/dvbplayer.c
index e936ca2c..dc206a39 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.32 2013/02/25 12:15:58 kls Exp $
+ * $Id: dvbplayer.c 2.35 2013/03/08 13:44:19 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -33,6 +33,7 @@ private:
 public:
   cPtsIndex(void);
   void Clear(void);
+  bool IsEmpty(void);
   void Put(uint32_t Pts, int Index);
   int FindIndex(uint32_t Pts);
   };
@@ -49,6 +50,12 @@ void cPtsIndex::Clear(void)
   w = r = 0;
 }
 
+bool cPtsIndex::IsEmpty(void)
+{
+  cMutexLock MutexLock(&mutex);
+  return w == r;
+}
+
 void cPtsIndex::Put(uint32_t Pts, int Index)
 {
   cMutexLock MutexLock(&mutex);
@@ -810,12 +817,14 @@ void cDvbPlayer::Goto(int Index, bool Still)
 
 void cDvbPlayer::SetAudioTrack(eTrackType Type, const tTrackId *TrackId)
 {
-  if (isPesRecording)
-     return; // for some unknown reason this doesn't work with PES recordings - causes a segfault
+  if (!cThread::IsMainThread())
+     return; // only do this upon user interaction
   if (playMode == pmPlay) {
-     int Current, Total;
-     if (GetIndex(Current, Total, true))
-        Goto(Current);
+     if (!ptsIndex.IsEmpty()) {
+        int Current, Total;
+        if (GetIndex(Current, Total, true))
+           Goto(Current);
+        }
      }
   else if (playMode == pmPause)
      resyncAfterPause = true;
diff --git a/epg2html b/epg2html
index 8b9e7b1f..1b1a2516 100755
--- a/epg2html
+++ b/epg2html
@@ -12,9 +12,11 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html 2.1 2011/12/04 14:17:35 kls Exp $
+# $Id: epg2html 2.2 2013/03/04 13:02:20 kls Exp $
 
 @Index = ();
+($Charset = $ENV{LANG}) =~ s/^[^.]*\.?(.*)/$1/;
+$Charset = "utf-8" unless $Charset || $ENV{LANG} == 'C';
 
 sub GetDay
 {
@@ -79,10 +81,16 @@ while (<>) {
                       }
                   push(@Schedule, "</table>\n") if (@Schedule);
                   open(PAGE, ">$Page") or die "$Page: $!\n";
-                  print PAGE "<html>\n<head><title>$Channel</title><head>\n<body>\n";
+                  print PAGE "<html>\n";
+                  print PAGE "<head>\n";
+                  print PAGE "<title>$Channel</title>\n";
+                  print PAGE "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=$Charset\">\n";
+                  print PAGE "</head>\n";
+                  print PAGE "<body>\n";
                   print PAGE "<h1>$Channel</h1>\n";
                   print PAGE @Schedule;
-                  print PAGE "</body>\n</html>\n";
+                  print PAGE "</body>\n";
+                  print PAGE "</html>\n";
                   close(PAGE);
                   last;
                   }
@@ -91,7 +99,13 @@ while (<>) {
       }
 
 open(INDEX, ">index.htm") or die "index.htm: $!\n";
-print INDEX "<html>\n<head><title>EPG Index</title><head>\n<body>\n";
+print INDEX "<html>\n";
+print INDEX "<head>\n";
+print INDEX "<title>EPG Index</title>\n";
+print INDEX "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=$Charset\">\n";
+print INDEX "</head>\n";
+print INDEX "<body>\n";
 print INDEX sort { lc($a) cmp lc($b) } @Index;
-print INDEX "</body>\n</html>\n";
+print INDEX "</body>\n";
+print INDEX "</html>\n";
 close(INDEX);
diff --git a/menu.c b/menu.c
index 4db68ec7..77326972 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.80 2013/02/19 09:33:26 kls Exp $
+ * $Id: menu.c 2.81 2013/03/04 14:11:47 kls Exp $
  */
 
 #include "menu.h"
@@ -2608,6 +2608,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"),        &data.MenuKeyCloses));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"),  &data.FoldersInTimerMenu));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Always sort folders first"), &data.AlwaysSortFoldersFirst));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"),            &data.ColorKey0, 4, keyColorTexts));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"),            &data.ColorKey1, 4, keyColorTexts));
@@ -2649,6 +2650,8 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         ModifiedAppearance = true;
      if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP))
         ModifiedAppearance = true;
+     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst)
+        Recordings.ClearSortNames();
      }
 
   int oldSkinIndex = skinIndex;
diff --git a/nit.c b/nit.c
index c18aa826..89988618 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.9 2012/01/12 08:43:52 kls Exp $
+ * $Id: nit.c 2.10 2013/03/07 09:42:29 kls Exp $
  */
 
 #include "nit.h"
@@ -185,6 +185,21 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     }
                  }
                  break;
+            case SI::S2SatelliteDeliverySystemDescriptorTag: {
+                 if (Setup.UpdateChannels >= 5) {
+                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                        if (!Channel->GroupSep() && cSource::IsSat(Channel->Source()) && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                           SI::S2SatelliteDeliverySystemDescriptor *sd = (SI::S2SatelliteDeliverySystemDescriptor *)d;
+                           cDvbTransponderParameters dtp(Channel->Parameters());
+                           dtp.SetSystem(DVB_SYSTEM_2);
+                           dtp.SetStreamId(sd->getInputStreamIdentifier());
+                           Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), dtp.ToString('S'));
+                           break;
+                           }
+                        }
+                    }
+                 }
+                 break;
             case SI::CableDeliverySystemDescriptorTag: {
                  SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d;
                  cDvbTransponderParameters dtp;
@@ -317,7 +332,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   //int SystemId = td->getSystemId();
                                   cDvbTransponderParameters dtp(Channel->Parameters());
                                   dtp.SetSystem(DVB_SYSTEM_2);
-                                  dtp.SetPlpId(td->getPlpId());
+                                  dtp.SetStreamId(td->getPlpId());
                                   if (td->getExtendedDataFlag()) {
                                      static int T2Bandwidths[] = { 8000000, 7000000, 6000000, 5000000, 10000000, 1712000, 0, 0 };
                                      dtp.SetBandwidth(T2Bandwidths[td->getBandwidth()]);
diff --git a/po/ar.po b/po/ar.po
index 41657931..80d3e7de 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,7 +1,7 @@
 # VDR language source file.
-# Copyright (C) 2008 Osama Alrawab <alrawab@hotmail.com>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Osama Alrawab <alrawab@hotmail.com>, 2008
+# Osama Alrawab <alrawab@hotmail.com>, 2010, 2013
 #
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "********قناة خاطئة***************"
+msgstr "*** قناة خاطئة ***"
 
 msgid "Channel not available!"
 msgstr "القناة غير متاحة"
@@ -33,7 +33,7 @@ msgid "off"
 msgstr "ايقاف"
 
 msgid "on"
-msgstr ""
+msgstr "تشغيل"
 
 msgid "auto"
 msgstr "ذاتى"
@@ -45,7 +45,7 @@ msgid "Polarization"
 msgstr "الاستقطاب"
 
 msgid "System"
-msgstr ""
+msgstr "النظام"
 
 msgid "Srate"
 msgstr "معدل الترميز"
@@ -75,254 +75,254 @@ msgid "Hierarchy"
 msgstr "الهرمية"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى "
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Movie/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detective/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Adventure/Western/War"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Science Fiction/Fantasy/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Comedy"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Soap/Melodrama/Folkloric"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romance"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Serious/Classical/Religious/Historical Movie/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Adult Movie/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "News/Current Affairs"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "News/Weather Report"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "News Magazine"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documentary"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discussion/Inverview/Debate"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Show/Game Show"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Game Show/Quiz/Contest"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Variety Show"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talk Show"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sports"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Special Event"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Sport Magazine"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Football/Soccer"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Team Sports"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Athletics"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Motor Sport"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Water Sport"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Winter Sports"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equestrian"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Martial Sports"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Children's/Youth Programme"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Pre-school Children's Programme"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Entertainment Programme for 6 to 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Entertainment Programme for 10 to 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informational/Educational/School Programme"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Cartoons/Puppets"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Music/Ballet/Dance"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Serious/Classical Music"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folk/Tradional Music"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Arts/Culture"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Performing Arts"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Fine Arts"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religion"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Popular Culture/Traditional Arts"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literature"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Experimental Film/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Broadcasting/Press"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "New Media"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Arts/Culture Magazine"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Fashion"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Social/Political/Economics"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazine/Report/Documentary"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Economics/Social Advisory"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Remarkable People"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Education/Science/Factual"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Nature/Animals/Environment"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technology/Natural Sciences"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicine/Physiology/Psychology"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Foreign Countries/Expeditions"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Social/Spiritual Sciences"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Further Education"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Languages"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Leisure/Hobbies"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Tourism/Travel"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Handicraft"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motoring"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness & Health"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Cooking"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Advertisement/Shopping"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Gardening"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Original Language"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Black & White"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Unpublished"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Live Broadcast"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "from %d"
 
 msgid "No title"
 msgstr "لايوجد عنوان"
@@ -415,7 +415,7 @@ msgid "Key$Info"
 msgstr "معلومات"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Play/Pause"
 
 msgid "Key$Play"
 msgstr "عرض"
@@ -487,7 +487,7 @@ msgid "Key$Commands"
 msgstr "اوامر"
 
 msgid "Key$User0"
-msgstr ""
+msgstr "المستخدم 0"
 
 msgid "Key$User1"
 msgstr "المستخدم 1"
@@ -547,25 +547,25 @@ msgid "Apid2"
 msgstr "PID الصوت 2"
 
 msgid "Dpid1"
-msgstr ""
+msgstr "Dpid1"
 
 msgid "Dpid2"
-msgstr ""
+msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
-msgstr ""
+msgstr "Tpid"
 
 msgid "CA"
 msgstr "الكامة"
 
 msgid "Sid"
-msgstr ""
+msgstr "Sid"
 
 msgid "Channel settings are not unique!"
 msgstr "اعدادات القناة غبر موحد"
@@ -592,29 +592,29 @@ msgid "Delete channel?"
 msgstr "حذف القناة"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "تحرير مجلد"
 
 msgid "New folder"
-msgstr ""
+msgstr "مجلد جديد"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "مجلد فرعى"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "المجلد موجود بالفعل"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "'%c'! اسم المجلد لا يجب ان يحتوى على"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "الزر"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "حذف المجلد وكل المجلدات الفرعية"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "حذف مجلد؟"
 
 msgid "Edit timer"
 msgstr "تعديل الموءقت"
@@ -635,7 +635,7 @@ msgid "Stop"
 msgstr "ايقاف"
 
 msgid "VPS"
-msgstr ""
+msgstr "VPS"
 
 msgid "Priority"
 msgstr "الاستقطاب"
@@ -647,19 +647,19 @@ msgid "File"
 msgstr "ملف"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Folder"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Single"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Repeating"
 
 msgid "First day"
 msgstr "اليوم الاول"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Select folder"
 
 msgid "Timers"
 msgstr "الموءقت"
@@ -749,7 +749,7 @@ msgid "Delete recording?"
 msgstr "حذف التسجيل"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Recording is being edited - really delete?"
 
 msgid "Error while deleting recording!"
 msgstr "حدث خطاء عند محاولة حذف التسجيل"
@@ -779,16 +779,16 @@ msgid "Setup.OSD$Theme"
 msgstr " الثيمة"
 
 msgid "Setup.OSD$Left (%)"
-msgstr ""
+msgstr "Left (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr ""
+msgstr "Top (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr ""
+msgstr "Width (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr ""
+msgstr "Height (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "مواقيت الرسائل"
@@ -809,13 +809,13 @@ msgid "Setup.OSD$Fixed font"
 msgstr "الخط ثابت"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr ""
+msgstr "Default font size (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr ""
+msgstr "Small font size (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr ""
+msgstr "Fixed font size (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr " موضع معلومات القناة"
@@ -848,22 +848,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "مجلد التسجيلات"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Folders in timer menu"
+
+msgid "Setup.OSD$Always sort folders first"
+msgstr "قم دائما بسرد المجلدات اولا"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Number keys for characters"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Color key 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Color key 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Color key 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Color key 3"
 
 msgid "EPG"
 msgstr "الدليل الالكتونى للقنوات"
@@ -934,7 +937,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "كرت الستالايت الاولى"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Standard compliance"
 
 msgid "Setup.DVB$Video format"
 msgstr "نوع الفيديو  "
@@ -989,10 +992,10 @@ msgstr "التردد المرتفع للاقط م هرتز"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Device %d connected to sat cable"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "own"
 
 msgid "CAM reset"
 msgstr "اعادة تشغيل الكامة"
@@ -1025,16 +1028,16 @@ msgid "Can't reset CAM!"
 msgstr "تعذر اعادة تشغيل الكامة"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "لا تقم بايقاف الفديو الحى"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "تاكيد ايقاف الفديو الحى"
 
 msgid "pause live video"
-msgstr ""
+msgstr "ايقاف الفديو الحى"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirm"
 
 msgid "yes"
 msgstr "نعم"
@@ -1043,10 +1046,10 @@ msgid "Recording"
 msgstr "تسجيل"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr ""
+msgstr "Margin at start (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr ""
+msgstr "Margin at stop (min)"
 
 msgid "Setup.Recording$Default priority"
 msgstr "الاولويات الافتراضية"
@@ -1055,7 +1058,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "معدل البقاء باليوم"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Pause key handling"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "تعطيل الاولويات"
@@ -1070,7 +1073,7 @@ msgid "Setup.Recording$Use VPS"
 msgstr "استعمل VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr ""
+msgstr "VPS margin (s)"
 
 msgid "Setup.Recording$Mark instant recording"
 msgstr "علم التسجيل الفورى"
@@ -1082,7 +1085,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "مدة التسجيل الفورى بالدقيقة"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "present event"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "اقصى حجم لملف الفيديو ب م ب"
@@ -1091,7 +1094,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "اقسم الملف المعدل"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Delete timeshift recording"
 
 msgid "Replay"
 msgstr "اعادة عرض"
@@ -1103,13 +1106,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "اضهر طور الاعادة"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Show remaining time"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Progress display time (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pause replay when setting mark"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
@@ -1124,19 +1127,19 @@ msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "اقل مدة لعدم تفاعل المستخدم بالدقيقة"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr ""
+msgstr "SVDRP timeout (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr ""
+msgstr "Zap timeout (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "مدة انتهاء مدخلات القناة بالدقيقة"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Remote control repeat delay (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Remote control repeat delta (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "القناة الاساسية"
@@ -1148,10 +1151,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "فعل الصوت"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Channels wrap"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Show channel names with source"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "خروج طارىء"
@@ -1220,7 +1223,7 @@ msgid "Pausing live video..."
 msgstr "تجميد العرض الحى"
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Delete timeshift recording?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1230,7 +1233,7 @@ msgid "No editing marks defined!"
 msgstr "لاتوجد علامات تعديل معرفة"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "No editing sequences defined!"
 
 msgid "Can't start editing process!"
 msgstr "لا يمكن البدء فى عملية التعديل"
@@ -1242,13 +1245,13 @@ msgid "Editing process already active!"
 msgstr "عملية التعديل نشطة بالفعل"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr ""
+msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr ""
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
-msgstr ""
+msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
 msgstr "اعادة الكتابة"
@@ -1269,13 +1272,13 @@ msgid "Low disk space!"
 msgstr "مساحة القرص غير كافية"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Regenerating index file"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Index file regeneration complete"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Index file regeneration failed!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "لا يمكن قفل الحاسوب الرمز s لم يحدد"
@@ -1295,16 +1298,16 @@ msgstr "الاغلاق على اى حال"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s wakes up in %ld min, continue?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Editing - restart anyway?"
 
 msgid "Recording - restart anyway?"
-msgstr ""
+msgstr "Recording - restart anyway?"
 
 msgid "restart anyway?"
-msgstr ""
+msgstr "restart anyway?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1314,33 +1317,33 @@ msgid "Classic VDR"
 msgstr "VDR تقليدى  "
 
 msgid "DISK"
-msgstr ""
+msgstr "قرص"
 
 msgid "LOAD"
-msgstr ""
+msgstr "تجميل"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "مؤقت"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "جهاز"
 
 msgid "LIVE"
-msgstr ""
+msgstr "بث حى"
 
 msgid "PLAY"
-msgstr ""
+msgstr "عرض"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG شاشة "
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr ""
+msgstr "MTWTFSS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr ""
+msgstr "MonTueWedThuFriSatSun"
 
 msgid "Monday"
 msgstr "الاحد"
@@ -1364,10 +1367,10 @@ msgid "Sunday"
 msgstr "الاحد"
 
 msgid "Upcoming recording!"
-msgstr ""
+msgstr "التسجيل القادم"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "ايقاف الفديو الحى"
 
 msgid "Recording started"
 msgstr "ابتداء التسجيل"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index f1a24fcd..22aeb052 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -4,13 +4,13 @@
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
 # Jordi Vil� <jvila@tinet.org>, 2003
-# Luca Olivetti <luca@ventoso.org>, 2008
+# Luca Olivetti <luca@ventoso.org>, 2008, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -32,7 +32,7 @@ msgid "off"
 msgstr "off"
 
 msgid "on"
-msgstr ""
+msgstr "on"
 
 msgid "auto"
 msgstr "auto"
@@ -44,7 +44,7 @@ msgid "Polarization"
 msgstr "Polaritzaci�"
 
 msgid "System"
-msgstr ""
+msgstr "Sistema"
 
 msgid "Srate"
 msgstr "Srate"
@@ -74,254 +74,254 @@ msgid "Hierarchy"
 msgstr "Jerarquia"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Iniciant exploraci� EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Pel�l�cula/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detectiu/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Aventura/Oest/Guerra"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Ci�ncia-ficci�/Fantasia/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Com�dia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Telenovel�la/Melodrama/Folklore"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Rom�ntic"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Seri�s/Cl�ssic/Relogi�s/Pel�l�cula hist�rica/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Pel�l�cula per a adults/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Not�cies/Actualitat"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Not�cies/El temps"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Revista de not�cies"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documental"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discussi�/Entrevista/Debat"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Espectacle/Jocs"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Jocs/Concurso"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Espectacle de varietats"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talk show"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Esports"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Esdeveniment especial"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Revista d'esports"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Futbol"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Esquaix"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Esports d'equip"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletisme"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Esports de motor"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Esports aqu�tics"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Esports d'hivern"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equitaci�"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Arts marcials"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Programa per a nens/joves"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Programa per a nens de preescolar"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Programa d'entreteniment de 6 a 14 anys"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Programa d'entreteniment de 10 a 16 anys"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informatiu/Educatiu/Programa escolar"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Dibuixos/Titelles"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "M�sica/Ballet/Dansa"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "M�sica cl�ssica/seriosa"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "M�sica folkl�rica/tradicional"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Arts/Cultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Arts esc�niques"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Belles arts"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religi�"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Cultura popular/Arts tradicionals"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Pel�l�cula/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Pel�l�cula/V�deo experimental"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Radiodifusi�/Premsa"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nous mitjans de comunicaci�"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Revista d'art/cultura"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Societat/Pol�tica/Economia"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Revista/Informe/Documental"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Assessorament econ�mic/social"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Persones notables"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Educaci�/Ci�ncia/Factual"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Naturalesa/Animals/Medi ambient"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tecnologia/Ci�ncies naturals"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Fisiologia/Psicologia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Pa�sos estrangers/Expedicions"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Ci�ncies socials/espirituals"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Educaci� superior"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Lleng�es"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Oci/Afici�ns"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turisme/Viatges"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Manualitats"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motor"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness i salut"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Cuina"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Publicitat/Compres"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Jardineria"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Idioma original"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Blanc i negre"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "No publicat"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Emissi� en directe"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "de %d"
 
 msgid "No title"
 msgstr "Sense t�tol"
@@ -414,7 +414,7 @@ msgid "Key$Info"
 msgstr "Informaci�"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Repr./Pausa"
 
 msgid "Key$Play"
 msgstr "Reproduir"
@@ -591,29 +591,29 @@ msgid "Delete channel?"
 msgstr "Esborrar el canal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Modificar carpeta"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nova carpeta"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Sub carpeta"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "La carpeta ja existeix!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "El nom de la carpeta no pot contenir '%c'"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Seleccionar"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Esborrar carpetas i totes les sub carpetes?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Esborrar carpeta?"
 
 msgid "Edit timer"
 msgstr "Editar temporitzador"
@@ -646,19 +646,19 @@ msgid "File"
 msgstr "Arxiu"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Carpeta"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Individual"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Repetitiu"
 
 msgid "First day"
 msgstr "Primer dia"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Seleccioni carpeta"
 
 msgid "Timers"
 msgstr "Temporitzadors"
@@ -748,7 +748,7 @@ msgid "Delete recording?"
 msgstr "Esborrar gravaci�?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "S'est� editant la gravaci� - esborrar igualment?"
 
 msgid "Error while deleting recording!"
 msgstr "Error a l'esborrar la gravaci�!"
@@ -847,22 +847,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Gravacions en subcarpetes"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Carpetes en men� temporitzadors"
+
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sempre ordenar primer carpetes"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Tecles num�riques per a car�cters "
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Tecla color 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Tecla color 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Tecla color 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Tecla color 3"
 
 msgid "EPG"
 msgstr "Guia de Programes"
@@ -900,7 +903,7 @@ msgid "letterbox"
 msgstr "letterbox"
 
 msgid "center cut out"
-msgstr "center cut out"
+msgstr "nom�s part central"
 
 msgid "no"
 msgstr "no"
@@ -933,7 +936,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Tarja DVB prim�ria"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Conformitat a est�ndards"
 
 msgid "Setup.DVB$Video format"
 msgstr "Format del v�deo"
@@ -988,10 +991,10 @@ msgstr "Freq
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Dispositiu %d connectat a cable sat�l�lit"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "propi"
 
 msgid "CAM reset"
 msgstr "Reiniciar CAM"
@@ -1024,16 +1027,16 @@ msgid "Can't reset CAM!"
 msgstr "No puc reiniciar la CAM!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "no pausar emissi� en directe"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "confirmar pausar emissi� en directe"
 
 msgid "pause live video"
-msgstr ""
+msgstr "pausar emissi� en directe"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirmar"
 
 msgid "yes"
 msgstr "s�"
@@ -1054,7 +1057,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durada predefinida"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Gesti� tecla pausa"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritat de la pausa"
@@ -1081,7 +1084,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Temps de gravaci� instant�nia (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "esdeveniment actual"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Mida m�xima de l'arxiu (MB)"
@@ -1090,7 +1093,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Separar arxius"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Esborrar gravacions timeshift"
 
 msgid "Replay"
 msgstr "Opcions de Reproducci�"
@@ -1102,13 +1105,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar mode de reproducci�"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Mostrar temps restant"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Visualitzaci� temps avan� (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pausar reproducci� en establir marca"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
@@ -1132,10 +1135,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Temps d'introducci� canal (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Retard repetici� comandament a dist�ncia (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Delta repetici� comandament a dist�ncia (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canal inicial"
@@ -1147,10 +1150,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volum inicial"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Primer canal despr�s de l'ultim"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Mostrar noms canals amb fonts"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Sortida d'emerg�ncia"
@@ -1219,17 +1222,17 @@ msgid "Pausing live video..."
 msgstr "Pausa d'emissi� en directe..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Esborrar gravaci� timeshift?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "Salta a:"
+msgstr "Salta a: "
 
 msgid "No editing marks defined!"
 msgstr "No hi ha marques d'edici� definides"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "No hi ha seq��ncies d'edici� definides"
 
 msgid "Can't start editing process!"
 msgstr "No puc iniciar el proc�s d'edici�!"
@@ -1268,13 +1271,13 @@ msgid "Low disk space!"
 msgstr "Disc gaireb� ple!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Regenerant fitxer �ndex"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Regeneraci� fitxer �ndex acabada"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Ha fallat la regeneraci� del fitxer �ndex"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "No puc apagar, falta la opci� -s !"
@@ -1313,22 +1316,22 @@ msgid "Classic VDR"
 msgstr "VDR clasico"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISC"
 
 msgid "LOAD"
-msgstr ""
+msgstr "C�RREGA"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TEMPORITZADORS"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "DISPOSITIUS"
 
 msgid "LIVE"
-msgstr ""
+msgstr "EN DIRECTE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "REPRODUIR"
 
 msgid "ST:TNG Panels"
 msgstr "Quadres ST:TNG"
@@ -1366,7 +1369,7 @@ msgid "Upcoming recording!"
 msgstr "Gravaci� a punt d'iniciar!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Pausar emissi� en directe?"
 
 msgid "Recording started"
 msgstr "Gravaci� comen�ada"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 6a833ea8..818c9c17 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
-"Last-Translator: Aleš Ju�~Yík <ajurik@quick.cz>\n"
+"Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -76,8 +76,8 @@ msgstr "Hierarchický mód"
 msgid "Rolloff"
 msgstr "RollOff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Začíná prohledávání EPG"
@@ -849,6 +849,9 @@ msgstr "Seznam nahrávek"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Složky v menu časovače"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Adresáře řadit vždy na začátek"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Psát písmena pomocí číselných kláves"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 511e03f6..73a21221 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "Hierarki"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "Optagelser i foldere"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 77af04a7..9e879771 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -73,8 +73,8 @@ msgstr "Hierarchie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Aktualisiere EPG-Daten"
@@ -846,6 +846,9 @@ msgstr "Aufnahmeverzeichnisse"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Verzeichnisse im Timer-Men�"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Verzeichnisse immer zuerst einsortieren"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummerntasten f�r Zeichen"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index d0c1c7df..50fe4601 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f5684e4d..2ef8807a 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -74,8 +74,8 @@ msgstr "Jerarqu
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
@@ -847,6 +847,9 @@ msgstr "Mostrar carpetas de grabaciones"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Carpetas en men� timers"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Siempre ordenar primero carpetas"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
@@ -1314,7 +1317,7 @@ msgid "DISK"
 msgstr "DISCO"
 
 msgid "LOAD"
-msgstr "CARGAR"
+msgstr "CARGA"
 
 msgid "TIMERS"
 msgstr "TIMERS"
diff --git a/po/et_EE.po b/po/et_EE.po
index ffb3c91b..e60cf5ae 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -73,8 +73,8 @@ msgstr "Hierarhia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PLP-tunnus"
+msgid "StreamId"
+msgstr "Stream-tunnus"
 
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine käivitatud"
@@ -846,6 +846,9 @@ msgstr "Kausta nime salvestamine"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Kaustad taimeri menüüs"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sorteerida kaustad alati ette"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index dbf3e80e..7475eb79 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -4,15 +4,16 @@
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002, 2003
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003, 2004, 2005, 2006, 2007, 2008
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003-2008, 2010-2013
+# Matti Lehtimäki <matti.lehtimaki@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
-"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -76,8 +77,8 @@ msgstr "Hierarkia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PLP-tunniste"
+msgid "StreamId"
+msgstr "Lähetetunniste"
 
 msgid "Starting EPG scan"
 msgstr "Ohjelmaoppaan päivitys aloitettu"
@@ -849,6 +850,9 @@ msgstr "Näytä tallennehakemistot"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Näytä kansiot ajastinvalikossa"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Näytä kansiot ensin"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e12b5984..57a6927b 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -11,14 +11,15 @@
 # Marc Perrudin <vdr@ekass.net>, 2013
 # Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
 # Peter Münster <pmlists@free.fr>, 2013
+# Dominique Plu <dplu@free.fr>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
-"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
+"Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -82,8 +83,8 @@ msgstr "Hiérarchie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Mise à jour du guide des programmes"
@@ -855,6 +856,9 @@ msgstr "Dossiers d'enregistrements"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Dossiers dans menu programmation"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Toujours trier les dossiers en premier"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Touches numériques pour caractères"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index af63cc12..3a0f73ab 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -75,7 +75,7 @@ msgstr "Hijerarhija"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -848,6 +848,9 @@ msgstr "Imenik za snimke"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 260668a6..26ed167a 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -77,8 +77,8 @@ msgstr "Hierarhia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PLP azonosító"
+msgid "StreamId"
+msgstr "Stream azonosító"
 
 msgid "Starting EPG scan"
 msgstr "EPG adatok aktualizálása"
@@ -850,6 +850,9 @@ msgstr "Felvételek listája"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Könyvtárválasztás az időzítő menüben"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Számgombok a betűkön"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index e6c848b7..ebd68f9b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-11 23:46+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -80,8 +80,8 @@ msgstr "Gerarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -853,6 +853,9 @@ msgstr "Directory di registrazione"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Cartelle nel menu timer"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Ordina sempre per prima le cartelle"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index e9f24ca4..6337db4b 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -73,8 +73,8 @@ msgstr "Hierarchija"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
@@ -846,6 +846,9 @@ msgstr "Įrašų katalogai"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Katalogai esantys laikmačių meniu"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Skaičių mygtukai simboliams"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index aed2f83c..39444c74 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -74,8 +74,8 @@ msgstr "Хиерархија"
 msgid "Rolloff"
 msgstr "Рол-оф"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Започнувам скенирање на EPG"
@@ -847,6 +847,9 @@ msgstr "Директориум за снимки"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Директориуми во менито за тајмер"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Секогаш сортирај прво папки"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Нумерички копчиња за букви"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c95b22aa..1d1bb731 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -6,14 +6,15 @@
 # Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
 # Carel Willemse <carel@nekanali.nl>, 2008, 2013
 # Johan Schuring <johan.schuring@vetteblei.nl>, 2008
+# Cedric Dewijs <cedric.dewijs@telfort.nl>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.38\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
-"Last-Translator: Carel Willemse <carel@nekanali.nl>\n"
+"Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -77,8 +78,8 @@ msgstr "Hierarchie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
@@ -850,6 +851,9 @@ msgstr "Opname mappen"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Mappen in timermenu"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Altijd mappen eerst sorteren"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummertoetsen voor karakters"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 664018bb..c8491e1e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -74,7 +74,7 @@ msgstr "Hierarchy"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -847,6 +847,9 @@ msgstr "Kataloger til opptak"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 351e59f7..35a39c43 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -75,8 +75,8 @@ msgstr "Hierarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
@@ -848,6 +848,9 @@ msgstr "Katalogi nagra
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Katalogi w menu timera"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Klawisze numeryczne dla liter"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9dec2876..a485e2ba 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -74,7 +74,7 @@ msgstr "Hierarquia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -847,6 +847,9 @@ msgstr "Pasta de grava
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Pastas no menu de grava��es"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 4c257ad8..a7b6ce81 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -75,8 +75,8 @@ msgstr "Ierarhie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "Identificator PLP"
+msgid "StreamId"
+msgstr "Identificator Stream"
 
 msgid "Starting EPG scan"
 msgstr "Pornesc achiziţia EPG"
@@ -848,6 +848,9 @@ msgstr "Directoare înregistrări"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Directoare în meniul de timer-e"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sortează întotdeauna directoarele la început"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Caractere pe tastele numerice"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3f4f9849..ea09a3ff 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-03-03 13:43+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -74,8 +74,8 @@ msgstr "
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
@@ -847,6 +847,9 @@ msgstr "
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "���������� � ���� ������"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "���������� ������ ��� ��������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 6aea45c2..977d7636 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2013-01-29 22:39+0100\n"
+"PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
@@ -73,11 +73,11 @@ msgstr "Hierarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
-msgstr "Za��na preh�ad�va� EPG"
+msgstr "Sp���a sa sn�manie EPG"
 
 msgid "Content$Movie/Drama"
 msgstr "Film/Dr�ma"
@@ -763,7 +763,7 @@ msgid "always"
 msgstr "v�dy"
 
 msgid "OSD"
-msgstr "OSD"
+msgstr "OSD (Menu na obrazovke)"
 
 msgid "Setup.OSD$Language"
 msgstr "Jazyk"
@@ -841,11 +841,14 @@ msgid "Setup.OSD$Menu key closes"
 msgstr "Kl�vesa Menu zaviera"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Zoznam nahr�vok"
+msgstr "Prev�dzkova� zlo�ky nahr�vky"
 
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Zlo�ky v menu pl�nova�a"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Zlo�ky v�dy najprv usporiada�"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "P�sa� znaky ��seln�mi tla�idlami"
 
@@ -862,16 +865,16 @@ msgid "Setup.OSD$Color key 3"
 msgstr "Farba kl�vesy 3"
 
 msgid "EPG"
-msgstr "EPG"
+msgstr "EPG (Elektronick� programov� sprievodca)"
 
 msgid "Button$Scan"
 msgstr "Skenova�"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "�asov� limit pre sn�manie EPG (h)"
+msgstr "Interval sn�mania EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "EPG �rove� chyb"
+msgstr "�rove� opravy EPG ch�b"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Ukazova� star�ie EPG d�ta (min)"
@@ -918,7 +921,7 @@ msgid "add new transponders"
 msgstr "prida� nov� transpond�ry"
 
 msgid "DVB"
-msgstr "DVB"
+msgstr "DVB (digit�lne telev�zne vysielanie)"
 
 msgid "Button$Audio"
 msgstr "Zvuk"
@@ -969,7 +972,7 @@ msgid "Setup.DVB$Subtitle background transparency"
 msgstr "Prieh�adnos� pozadia titulkov"
 
 msgid "LNB"
-msgstr "LNB"
+msgstr "LNB (n�zko �umov� jednotka)"
 
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Pou��va� DiSEqC"
@@ -1000,7 +1003,7 @@ msgid "CAM ready"
 msgstr "CAM pripraven�"
 
 msgid "CAM"
-msgstr "CAM"
+msgstr "CAM (modul podmienen�ho pr�stupu)"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1054,10 +1057,10 @@ msgid "Setup.Recording$Pause key handling"
 msgstr "Chovanie kl�vesy pozastavenia"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorita preru�enia"
+msgstr "Priorita pozastavenia"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "�ivotnos� preru�enia (d)"
+msgstr "�ivotnos� pozastavania (d)"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Pou��va� n�zov epiz�dy"
@@ -1072,7 +1075,7 @@ msgid "Setup.Recording$Mark instant recording"
 msgstr "Ozna�i� okam�it� nahr�vky"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Premenova� okam�it� nahr�vky"
+msgstr "Pomenova� okam�it� nahr�vky"
 
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "D�ka okam�it�ho nahr�vania (min)"
@@ -1102,7 +1105,7 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Zobrazi� zost�vaj�ci �as"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr "�as zobrazenia ukazovate�a priebehu (s)"
+msgstr "Doba zobrazenia ukazovate�a priebehu (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pozastavi� prehr�vanie pri stanoven� zna�ky"
@@ -1114,25 +1117,25 @@ msgid "Miscellaneous"
 msgstr "R�zne"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "limit pred nahr�van�m (min)"
+msgstr "V pohotovosti pred nahr�van�m (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "vymedzi� u��vate�sk� ne�innos� (min)"
+msgstr "Vymedzi� u��vate�sk� ne�innos� (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "�asov� limit SVDRP (s)"
+msgstr "�asov� limit odpovede SVDRP (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "pam�ta� predo�l� kan�l po ... (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "limit pri vo�be kan�la (ms)"
+msgstr "Limit pri ��selnej vo�be kan�la (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Zdr�anie opakovan�ho stla�enia  tla�idla (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Peri�da opakovania stla�en�ho tla�idla (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kan�l po spusten�"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 6c6abb55..86fefbc0 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
-# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008
+# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2008-02-28 19:44+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
 "Language: sl\n"
@@ -30,7 +30,7 @@ msgid "off"
 msgstr "izklop"
 
 msgid "on"
-msgstr ""
+msgstr "vklop"
 
 msgid "auto"
 msgstr "avtomatsko"
@@ -42,7 +42,7 @@ msgid "Polarization"
 msgstr "Polarizacija"
 
 msgid "System"
-msgstr ""
+msgstr "System"
 
 msgid "Srate"
 msgstr "Srate"
@@ -72,254 +72,254 @@ msgid "Hierarchy"
 msgstr "Hierarhija"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Odpadanje"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Pri�enjam EPG-scan"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detektiv/Triler"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Kavbojka/Vojna"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Znanstvena fantastika/Grozljivka"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Komedija"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Melodrama/Folklora"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romantika"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Resna/Klasi�na/Verska/Zgodovinski film/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Film za odrasle/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Novice/Trenutne afere"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Novice/Vremenska napoved"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Poro�ila"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokumentarec"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Diskudija/Interviju/Debata"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Igra/Igrani �ov"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Igrani �ov/Igre/Kviz"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Variete"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Pogovorna oddaja"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "�port"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Posebni dogodki"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "�portni magazin"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Nogomet"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenis"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Timski �port"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletika"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Moto dirke"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Vodni �port"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Zimski �port"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Konjeni�tvo"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Borilne ve��ine"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Otro�ki/Mladinski program"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Program za pred�olske otroke"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Zabavni program za 6 do 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Zabavni program za 10 do 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informativni/Izobra�evalni/�olski program"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Risanke"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Glasba/Balet/Ples"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rok/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Resna/Klasi�na Glasba"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Narodna/Tradicionalna glasba"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Kultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Igrana umetnost"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Uglajena umetnost"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Vera"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Popularna kultura/Tradicionalna umetnost"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Kino"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Eksperimentalni film/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Oddajanje/Novinarstvo"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Novi mediji"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Kulturni magazin"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Sociala/Politika/Ekonomija"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazin/Reporta�e/Dokumentarci"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Ekonomika/Socialno svetovanje"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Izjemni ljudje"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Izobra�evanje/Znanost"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Narava/�ivali/Okolje"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tehnologija/Znanost o naravi"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Psihologija/Psihiatrija"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Tuje de�ele/Potovanja"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Sociala/Spiritualna znanost"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Nadaljne izobra�evanje"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Jeziki"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Hobiji"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Potovanja"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Obrti"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Avtomobilizem"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitnes in zdravje"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Kuhanje"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Ogla�evanje/Nakupovanje"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Vrtnarjenje"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Originalni jeziki"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "�rno in belo"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Neobjavljeno"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Oddaja v �ivo"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "Star�evskaOcena$od %d"
 
 msgid "No title"
 msgstr "Brez naziva"
@@ -412,7 +412,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Nadaljuj/Pavza"
 
 msgid "Key$Play"
 msgstr "Predvajaj"
@@ -589,29 +589,29 @@ msgid "Delete channel?"
 msgstr "Izbri�i kanal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Uredi direktorij"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nov direktorij"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Pod direktorij"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Ime direktorija �e obstaja"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Direkotrij ne sme vsebobati '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Izberi"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Izbri�i direktorij in vse pod direktorije"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Izbri�i direkotrij?"
 
 msgid "Edit timer"
 msgstr "Uredi termin"
@@ -644,19 +644,19 @@ msgid "File"
 msgstr "Datoteka"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Direktorij"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Enkraten"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Ponavljajo�e"
 
 msgid "First day"
 msgstr "Prvi dan"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Izberi direkotrij"
 
 msgid "Timers"
 msgstr "Termini"
@@ -746,7 +746,7 @@ msgid "Delete recording?"
 msgstr "Izbri�i posnetek?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Posnetek se ureja - zares izbri�i?"
 
 msgid "Error while deleting recording!"
 msgstr "Napaka pri brisanju posnetka!"
@@ -812,7 +812,7 @@ msgid "Setup.OSD$Small font size (%)"
 msgstr "Majhna velikost pisave (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr ""
+msgstr "Font s fiksno dol�ino (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacije o kanalu"
@@ -845,22 +845,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Direktoriji za posnetke"
 
 msgid "Setup.OSD$Folders in timer menu"
+msgstr "Direktoriji v meniju urnika"
+
+msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "�tevilo tipk za znake"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Barvni gumb 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Barvni gumb 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Barvni gumb 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Barvni gumb 3"
 
 msgid "EPG"
 msgstr "Programski vodnik"
@@ -931,7 +934,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarna naprava"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Skladnost s standardom"
 
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
@@ -986,10 +989,10 @@ msgstr "Zgornja LNB-frek. (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Naprava %d priklju�ena na satelitski kabel"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "lastni"
 
 msgid "CAM reset"
 msgstr "Reset CAM-a"
@@ -1022,16 +1025,16 @@ msgid "Can't reset CAM!"
 msgstr "Ne morem resetirati CAM-a!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "ne ustavi videa v �ivo"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "potrdi zaustavitev videa v �ivo"
 
 msgid "pause live video"
-msgstr ""
+msgstr "ustavi video v �ivo"
 
 msgid "confirm"
-msgstr ""
+msgstr "potrdi"
 
 msgid "yes"
 msgstr "da"
@@ -1052,7 +1055,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Privzeti �ivljenski �as (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Gumb za pavzo"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioriteta pavze"
@@ -1079,7 +1082,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "�as direktnega snemanja (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "trenutni dogodek"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Najve�ja velikost datoteke (MB)"
@@ -1088,7 +1091,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Razdeli urejene datoteke"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Izbri�i snemanje z zamikom"
 
 msgid "Replay"
 msgstr "Predvajanje"
@@ -1100,13 +1103,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i re�im predvajanja"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Prika�i preostali �as"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Progresivni �as prikaza (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pavza predvajanja pri postavitvi zan�ke"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
@@ -1130,10 +1133,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Timeout za vnos kanala (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Ponavljajo�a pavza pri daljinski kontroli (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Ponavljajo�a razlika pri daljinski kontroli (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Privzeti kanal"
@@ -1145,10 +1148,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Privzeta glasnost"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Menjava kanala"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Prika�i imena kanalov z izvorom"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izhod v sili"
@@ -1217,7 +1220,7 @@ msgid "Pausing live video..."
 msgstr "Ustavljanje predvajanja v �ivo..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Izbri�i posnetek zamaknjenega snemanja"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1227,7 +1230,7 @@ msgid "No editing marks defined!"
 msgstr "Nobena prekinitvena to�ka ni definirana!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Sekvence za editiranje niso definirane"
 
 msgid "Can't start editing process!"
 msgstr "Ne morem za�eti urejanja!"
@@ -1266,13 +1269,13 @@ msgid "Low disk space!"
 msgstr "Premalo prostora na disku!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Ponovno generiranje indeksne datoteke"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Ponovno generiranje indeksne datoteke zaklju�eno"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Napaka pri ponovnem generiranju indeksne datoteke"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!"
@@ -1311,22 +1314,22 @@ msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISK"
 
 msgid "LOAD"
-msgstr ""
+msgstr "OBREMENITEV"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "URNIKI"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "NAPRAVE"
 
 msgid "LIVE"
-msgstr ""
+msgstr "V �IVO"
 
 msgid "PLAY"
-msgstr ""
+msgstr "PREDVAJAJ"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konsola"
@@ -1364,7 +1367,7 @@ msgid "Upcoming recording!"
 msgstr "Sledi snemanje!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Zaustavi video v �ivo"
 
 msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 1d503cda..d6b5f7af 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "Hijerarhija"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "Direktorij za snimke"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index de03d3d6..9b2ce7cc 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -77,8 +77,8 @@ msgstr "Hierarchy"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG-avs�kning"
@@ -850,6 +850,9 @@ msgstr "Visa mappar i inspelningsmenyn"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Visa mappar i timermenyn"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sortera alltid mappar f�rst"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Anv�nd sifferknappar f�r bokstavsinmatning"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 30e3fbd2..b5f57b02 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "Hiyerar
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "Kay
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 82b8d2a8..47534324 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -74,8 +74,8 @@ msgstr "Ієрархія"
 msgid "Rolloff"
 msgstr "Крен"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
@@ -847,6 +847,9 @@ msgstr "Теки зберігання записів"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Теки в меню таймера"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Завжди сортувати теки першими"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Кількість клавіш для символів"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3f4a6c6d..efb03006 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,23 +1,22 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Nan Feng <nfgx@21cn.com>, 2008
+# Nan Feng <nfvdr@live.com>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.39\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2009-09-23 23:50+0800\n"
-"Last-Translator: Nan Feng <nfgx@21cn.com>\n"
-"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2013-03-04 14:52+0800\n"
+"Last-Translator: NFVDR <nfvdr@live.com>\n"
+"Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.5\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "***无效的频道 ***"
@@ -76,252 +75,252 @@ msgstr "层次"
 msgid "Rolloff"
 msgstr "越零率"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "开始节目单扫描"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "电影/剧集"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "侦探/惊悚"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "冒险/西部/战争"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "科幻/幻想/恐怖"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "喜剧"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "香皂/文艺片/民俗"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "冒险故事"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "严肃的/古典/的历史宗教/电影/剧集"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "成人电影/剧集"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "新闻/时事"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "新闻/天气报告"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "新闻杂志"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "记录片"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "讨论/ Inverview/辩论"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "显示/游戏展"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "游戏展/测验/竞赛"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "综艺节目"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "脱口秀"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "体育"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "特别活动"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "体育杂志"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "足球/橄榄球"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "网球/壁球"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "团队运动"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "田径运动"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "汽车运动"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "水上运动"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "冬季运动"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "驭手"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "武术运动"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "儿童/青少年计划"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "学前儿童的计划"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "娱乐节目6〜14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "娱乐节目为10至16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "信息/教育/学校计划"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "漫画/木偶"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "音乐/芭蕾/舞蹈"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "摇滚/流行"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "严重/古典音乐"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "民谣/传统体育专业课程设置的音乐"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "爵士乐"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "音乐/歌剧"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "芭蕾舞"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "艺术/文化"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "表演艺术"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "精美艺术"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "宗教"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "流行文化/传统艺术"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "文学"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "电影/影院"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "实验电影/视频"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "广播/新闻"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "新媒体"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "艺术/文化杂志"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "时尚"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "社会/政治/经济"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "杂志/报告/记录"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "经济/社会咨询"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "杰出人士"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "教育/科学/事实"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "自然/动物/环境"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "技术/自然科学"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "医学/生理学/心理学"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "外国国家/探险"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "精神科学"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "延续教育"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "语言"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "休闲/爱好"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "旅游/旅行"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "手工艺"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "驾驶"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "健身与健康"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "烹饪"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "广告/购物"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "园林"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "原始语言"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "黑与白"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "未出版"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "现场直播"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "从 %d"
 
 msgid "No title"
 msgstr "没有标题"
@@ -414,7 +413,7 @@ msgid "Key$Info"
 msgstr "信息"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "播放/暂停"
 
 msgid "Key$Play"
 msgstr "播放"
@@ -591,29 +590,29 @@ msgid "Delete channel?"
 msgstr "是否删除频道？"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "编辑文件夹"
 
 msgid "New folder"
-msgstr ""
+msgstr "新文件夹"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "子文件夹"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "文件夹名称已经存在！"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "文件夹名称不能包含 '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "选择"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "删除文件夹和所有子文件夹吗？"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "是否删除文件夹?"
 
 msgid "Edit timer"
 msgstr "编辑计时器"
@@ -646,19 +645,19 @@ msgid "File"
 msgstr "文件"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "文件夹"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "单个"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "重复"
 
 msgid "First day"
 msgstr "第一天"
 
 msgid "Select folder"
-msgstr ""
+msgstr "选择文件夹"
 
 msgid "Timers"
 msgstr "录像中列表"
@@ -748,7 +747,7 @@ msgid "Delete recording?"
 msgstr "是否删除录像？"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "记录正在编辑 - 真的要删除？"
 
 msgid "Error while deleting recording!"
 msgstr "删除录像错误！"
@@ -847,22 +846,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "录像目录"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "定时器菜单中的文件夹"
+
+msgid "Setup.OSD$Always sort folders first"
+msgstr "总是排序文件夹"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "数字键的字符"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "彩色键0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "彩色键1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "彩色键2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "彩色键3"
 
 msgid "EPG"
 msgstr "电子节目单设置"
@@ -897,10 +899,10 @@ msgid "pan&scan"
 msgstr "pan&scan模式"
 
 msgid "letterbox"
-msgstr "letterbox模式"
+msgstr "小盒子模式"
 
 msgid "center cut out"
-msgstr "Center-cut-out模式"
+msgstr "中心剪切模式"
 
 msgid "no"
 msgstr "不"
@@ -933,7 +935,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "使用中卫星卡接口"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "符合标准"
 
 msgid "Setup.DVB$Video format"
 msgstr "视频格式"
@@ -988,10 +990,10 @@ msgstr "高本振频率 (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "设备%d卫星连接线"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "所有"
 
 msgid "CAM reset"
 msgstr "CAM重置"
@@ -1024,16 +1026,16 @@ msgid "Can't reset CAM!"
 msgstr "不能重启CAM"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "取消暂停当前视频"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "确认暂停当前视频"
 
 msgid "pause live video"
-msgstr ""
+msgstr "暂停现在视频"
 
 msgid "confirm"
-msgstr ""
+msgstr "确认"
 
 msgid "yes"
 msgstr "是"
@@ -1081,7 +1083,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "直接录像时间(min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "当前事件"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "最大的视频文件容量 (MB)"
@@ -1090,7 +1092,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "分离编辑文件"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "删除时移记录"
 
 msgid "Replay"
 msgstr "回放设置"
@@ -1102,13 +1104,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "显示回放模式"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "显示剩余时间"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "处理显示时间(s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "暂停回放时，设置标志"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
@@ -1132,10 +1134,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "频道进入超时 (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "远程控制重复延时（ms）"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "远程控制重复增量（ms）"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "初始频道"
@@ -1147,10 +1149,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "初始化声音"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "频道排序"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "显示频道名称与源"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "突发事件退出"
@@ -1219,7 +1221,7 @@ msgid "Pausing live video..."
 msgstr "暂停当前视频"
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "是否删除时移记录？"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1229,7 +1231,7 @@ msgid "No editing marks defined!"
 msgstr "无编辑标记定义!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "不编辑定义的序列！"
 
 msgid "Can't start editing process!"
 msgstr "不能开始编辑处理"
@@ -1268,13 +1270,13 @@ msgid "Low disk space!"
 msgstr "磁盘空间不足!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "重新生成索引文件"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "索引文件再生完成"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "索引文件再生失败！"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "不能关机 - 操作 '-s' 不允许!"
@@ -1313,22 +1315,22 @@ msgid "Classic VDR"
 msgstr "经典VDR面板"
 
 msgid "DISK"
-msgstr ""
+msgstr "磁盘"
 
 msgid "LOAD"
-msgstr ""
+msgstr "读取"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "定时器"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "设备"
 
 msgid "LIVE"
-msgstr ""
+msgstr "现场"
 
 msgid "PLAY"
-msgstr ""
+msgstr "播放"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG 面板"
@@ -1366,7 +1368,7 @@ msgid "Upcoming recording!"
 msgstr "准备录像！"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "是否暂停视频播放？"
 
 msgid "Recording started"
 msgstr "录像开始！"
diff --git a/recording.c b/recording.c
index ede7c1b9..032175dd 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.89 2013/03/03 10:54:05 kls Exp $
+ * $Id: recording.c 2.90 2013/03/04 14:02:40 kls Exp $
  */
 
 #include "recording.h"
@@ -943,7 +943,9 @@ char *cRecording::SortName(void) const
 {
   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
   if (!*sb) {
-     char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)), RecordingsSortMode != rsmName);
+     char *s = strdup(FileName() + strlen(VideoDirectory));
+     if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst)
+        s = StripEpisodeName(s, RecordingsSortMode != rsmName);
      strreplace(s, '/', '0'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      *sb = MALLOC(char, l);
@@ -953,6 +955,12 @@ char *cRecording::SortName(void) const
   return *sb;
 }
 
+void cRecording::ClearSortName(void)
+{
+  DELETENULL(sortBufferName);
+  DELETENULL(sortBufferTime);
+}
+
 int cRecording::GetResume(void) const
 {
   if (resume == RESUME_NOT_INITIALIZED) {
@@ -1422,6 +1430,13 @@ void cRecordings::ResetResume(const char *ResumeFileName)
   ChangeState();
 }
 
+void cRecordings::ClearSortNames(void)
+{
+  LOCK_THREAD;
+  for (cRecording *recording = First(); recording; recording = Next(recording))
+      recording->ClearSortName();
+}
+
 // --- cMark -----------------------------------------------------------------
 
 double MarkFramesPerSecond = DEFAULTFRAMESPERSECOND;
diff --git a/recording.h b/recording.h
index 4807fc9d..ff3119da 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.45 2013/03/03 10:48:39 kls Exp $
+ * $Id: recording.h 2.46 2013/03/04 14:01:23 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -99,6 +99,7 @@ private:
   cRecording &operator=(const cRecording &); // can't assign cRecording
   static char *StripEpisodeName(char *s, bool Strip);
   char *SortName(void) const;
+  void ClearSortName(void);
   int GetResume(void) const;
   time_t start;
   int priority;
@@ -187,6 +188,7 @@ public:
   void ChangeState(void) { state++; }
   bool StateChanged(int &State);
   void ResetResume(const char *ResumeFileName = NULL);
+  void ClearSortNames(void);
   cRecording *GetByName(const char *FileName);
   void AddByName(const char *FileName, bool TriggerUpdate = true);
   void DelByName(const char *FileName);
diff --git a/skinclassic.c b/skinclassic.c
index bbf36766..b9919d84 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.9 2013/02/22 15:25:31 kls Exp $
+ * $Id: skinclassic.c 2.10 2013/03/03 15:26:09 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -391,8 +391,7 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
   const cFont *font = cFont::GetFont(fontOsd);
   int y = y2;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/skinlcars.c b/skinlcars.c
index 7079d785..72e8302e 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.19 2013/02/15 15:08:02 kls Exp $
+ * $Id: skinlcars.c 2.21 2013/03/09 10:43:34 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -210,6 +210,7 @@ static cOsd *CreateOsd(int Left, int Top, int x0, int y0, int x1, int y1)
       Area.bpp = Bpp[i];
       if (Osd->CanHandleAreas(&Area, 1) == oeOk) {
          Osd->SetAreas(&Area, 1);
+         Osd->SetAntiAliasGranularity(20, 16);
          TwoColors = Area.bpp == 1;
          break;
          }
@@ -1599,8 +1600,7 @@ void cSkinLCARSDisplayMenu::SetRecording(const cRecording *Recording)
   int xl = xi00;
   int y = yi00;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/skinsttng.c b/skinsttng.c
index 94f54083..39a831a8 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.16 2012/09/09 11:39:06 kls Exp $
+ * $Id: skinsttng.c 2.17 2013/03/03 15:29:28 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
@@ -707,8 +707,7 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
   int xl = x3 + TextSpacing;
   int y = y3;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/vdr.5 b/vdr.5
index 4003a5e9..ca705d4b 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.30 2012/10/15 10:50:23 kls Exp $
+.\" $Id: vdr.5 2.31 2013/03/07 09:42:29 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -96,7 +96,7 @@ l l.
 \fBL\fR@Left circular polarization
 \fBM\fR@Modulation (2, 5, 6, 10, 11, 16, 32, 64, 128, 256, 998)
 \fBO\fR@rollOff (0, 20, 25, 35)
-\fBP\fR@Plp id (0-255)
+\fBP\fR@stream id (0-255)
 \fBR\fR@Right circular polarization
 \fBS\fR@delivery System (0, 1)
 \fBT\fR@Transmission mode (1, 2, 4, 8, 16, 32)
@@ -137,7 +137,9 @@ l l.
 \fBRolloff:\fR The Nyquist filter rolloff factor for DVB-S (\fB35\fR) and DVB-S2 (\fB35\fR, 25, 20),
 35 = 0.35, 25 = 0.25, 20 = 0.20, DVB-S/DVB-S2 default value is 0.35
 
-\fBPLP id:\fR Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-T2 only).
+\fBStream id:\fR Input Stream Identifier (ISI) (\fB0\fR-255) for DVB-S2 multiplex or
+Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-S2/DVB-T2 only,
+with devices that support "multi streaming").
 
 \fBTransmission mode:\fR Number of DVB-T OFDM carriers, 32 = 32k, 16 = 16k, 8 = 8k, 4 = 4k, 2 = 2k, 1 = 1k. If in doubt, try 8k.