- Changes for compiling with gcc 3.2

75 files changed, 1095 insertions, 1034 deletions

diff --git a/Makefile.cvs b/Makefile.cvs
index 71b2be4..a9893e8 100644
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -10,11 +10,18 @@ all:
 	@echo "Use make devel for development, make dist for distribution"
 	@echo $(KDEVER)
 
+strictbuild: devel
+	rm -f config.cache
+	./configure --prefix=/usr --mandir=/usr/share/man --enable-debug --enable-kde --enable-strict
+	make
+
 build: devel
+	rm -f config.cache
 	./configure --prefix=/usr --mandir=/usr/share/man --enable-debug --enable-kde
 	make
 
 buildnox: devel
+	rm -f config.cache
 	./configure --prefix=/usr --mandir=/usr/share/man --enable-debug
 	make
 
diff --git a/conf/configure.in.in b/conf/configure.in.in
index e5944d7..86f16ab 100644
--- a/conf/configure.in.in
+++ b/conf/configure.in.in
@@ -312,7 +312,7 @@ if test "x$ac_enable_kde" = "xyes" ; then
 	AC_CHECK_KDEMAXPATHLEN
 	KDE_CHECK_FINAL
 	AM_KDE_WITH_NLS
-	KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)"
+	KDE_PLUGIN="-avoid-version -module -no-undefined"
 	AC_SUBST(KDE_PLUGIN)
 	AM_CONDITIONAL(BUILD_KDE, true)
 fi
diff --git a/conf/m4/kde/AC_BASE_PATH_KDE.m4 b/conf/m4/kde/AC_BASE_PATH_KDE.m4
index 1654235..36abd13 100644
--- a/conf/m4/kde/AC_BASE_PATH_KDE.m4
+++ b/conf/m4/kde/AC_BASE_PATH_KDE.m4
@@ -104,14 +104,14 @@ fi
 AC_SUBST(kde_libraries)
 AC_SUBST(kde_includes)
 
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" ; then
+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include" ; then
  KDE_INCLUDES=""
 else
  KDE_INCLUDES="-I$kde_includes"
  all_includes="$KDE_INCLUDES $all_includes"
 fi
 
-if test "$kde_libraries" = "$x_libraries" || test "$kde_libraries" = "$qt_libraries" ; then
+if test "$kde_libraries" = "$x_libraries" || test "$kde_libraries" = "$qt_libraries" || test "$kde_libraries" = "/usr/lib" ; then
  KDE_LDFLAGS=""
 else
  KDE_LDFLAGS="-L$kde_libraries"
diff --git a/conf/m4/kde/AC_CHECK_RPATH.m4 b/conf/m4/kde/AC_CHECK_RPATH.m4
index a0e94d9..64c29fb 100644
--- a/conf/m4/kde/AC_CHECK_RPATH.m4
+++ b/conf/m4/kde/AC_CHECK_RPATH.m4
@@ -7,14 +7,14 @@ AC_ARG_ENABLE(rpath,
 
 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
 
-  KDE_RPATH="-rpath \$(kde_libraries)"
+  KDE_RPATH="-R \$(kde_libraries)"
 
   if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -rpath \$(qt_libraries)"
+    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
   fi
   dnl $x_libraries is set to /usr/lib in case
   if test -n "$X_LDFLAGS"; then
-    KDE_RPATH="$KDE_RPATH -rpath \$(x_libraries)"
+    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
   fi
   if test -n "$KDE_EXTRA_RPATH"; then
     KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
diff --git a/conf/m4/kde/AC_PATH_QT.m4 b/conf/m4/kde/AC_PATH_QT.m4
index ba2a0ab..bef8246 100644
--- a/conf/m4/kde/AC_PATH_QT.m4
+++ b/conf/m4/kde/AC_PATH_QT.m4
@@ -1,4 +1,4 @@
 AC_DEFUN(AC_PATH_QT,
 [
-AC_PATH_QT_1_3
+AC_PATH_QT_ANY
 ])
diff --git a/conf/m4/kde/AC_PATH_QT_1_3.m4 b/conf/m4/kde/AC_PATH_QT_1_3.m4
index f252c9e..26c3536 100644
--- a/conf/m4/kde/AC_PATH_QT_1_3.m4
+++ b/conf/m4/kde/AC_PATH_QT_1_3.m4
@@ -5,17 +5,17 @@ dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
 dnl
-AC_DEFUN(AC_PATH_QT_1_3,[
+AC_DEFUN(AC_TRY_PATH_QT,[
 	AC_REQUIRE([K_PATH_X])
 	AC_REQUIRE([KDE_USE_QT])
 
-	LIBQT="-lqt"
+	LIBQT="-l$1"
 	if test $kde_qtver = 2; then
 		AC_REQUIRE([AC_FIND_PNG])
 		LIBQT="$LIBQT $LIBPNG"
 	fi
 
-	AC_MSG_CHECKING([for Qt])
+	echo -n "($2) "
 
 	LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
 	ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
@@ -44,89 +44,100 @@ AC_DEFUN(AC_PATH_QT_1_3,[
 		]
 	)
 
-	AC_CACHE_VAL(ac_cv_have_qt,[
-		#try to guess Qt locations
+	#try to guess Qt locations
 
-		qt_incdirs="$QTINC /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/lib/qt3/include /usr/lib/qt2/include /usr/X11R6/include/X11/qt $x_includes"
-		test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
-		qt_incdirs="$ac_qt_includes $qt_incdirs"
+	qt_incdirs="$QTINC /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/lib/qt3/include /usr/lib/qt2/include /usr/X11R6/include/X11/qt $x_includes"
+	test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
+	qt_incdirs="$ac_qt_includes $qt_incdirs"
 
-		if test "$kde_qtver" = "2"; then
-			kde_qt_header=qstyle.h
-		else
-			kde_qt_header=qglobal.h
-		fi
+	if test "$kde_qtver" = "2"; then
+		kde_qt_header=qstyle.h
+	else
+		kde_qt_header=qglobal.h
+	fi
 
-		AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-		ac_qt_includes="$qt_incdir"
+	AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
+	ac_qt_includes="$qt_incdir"
 
-		qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt /usr/lib/qt3/lib /usr/lib/qt2/lib $x_libraries"
-		test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-		if test ! "$ac_qt_libraries" = "NO"; then
-			qt_libdirs="$ac_qt_libraries $qt_libdirs"
-		fi
+	qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt /usr/lib/qt3/lib /usr/lib/qt2/lib $x_libraries"
+	test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
+	if test ! "$ac_qt_libraries" = "NO"; then
+		qt_libdirs="$ac_qt_libraries $qt_libdirs"
+	fi
 
-		qt_libdir=NONE
-		for dir in $qt_libdirs; do
-			try="ls -1 $dir/libqt.*so"
-			if eval $try >/dev/null 2>&1 ; then
-				qt_libdir=$dir;
-				break;
-			else
-				echo "tried $dir" >&AC_FD_CC
-			fi
-		done
+	qt_libdir=NONE
+	for dir in $qt_libdirs; do
+		try="ls -1 $dir/lib$1.*so"
+		if eval $try >/dev/null 2>&1 ; then
+			qt_libdir=$dir;
+			break;
+		else
+			echo "tried $dir" >&AC_FD_CC
+		fi
+	done
 
-		ac_qt_libraries="$qt_libdir"
+	ac_qt_libraries="$qt_libdir"
 
-		AC_LANG_SAVE
-		AC_LANG_CPLUSPLUS
+	AC_LANG_SAVE
+	AC_LANG_CPLUSPLUS
 
-		ac_cxxflags_safe="$CXXFLAGS"
-		ac_ldflags_safe="$LDFLAGS"
-		ac_libs_safe="$LIBS"
+	ac_cxxflags_safe="$CXXFLAGS"
+	ac_ldflags_safe="$LDFLAGS"
+	ac_libs_safe="$LIBS"
 
-		CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-		LDFLAGS="-L$qt_libdir $all_libraries"
-		LIBS="$LIBS $LIBQT"
+	CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
+	LDFLAGS="-L$qt_libdir $all_libraries"
+	LIBS="$LIBS $LIBQT"
 
-		KDE_PRINT_QT_PROGRAM
+	KDE_PRINT_QT_PROGRAM
 
-		if AC_TRY_EVAL(ac_link) && test -s conftest; then
-			rm -f conftest*
-		else
-			echo "configure: failed program was:" >&AC_FD_CC
-			cat conftest.$ac_ext >&AC_FD_CC
-			ac_qt_libraries="NO"
-		fi
+	if AC_TRY_EVAL(ac_link) && test -s conftest; then
 		rm -f conftest*
-		CXXFLAGS="$ac_cxxflags_safe"
-		LDFLAGS="$ac_ldflags_safe"
-		LIBS="$ac_libs_safe"
-
-		AC_LANG_RESTORE
-
-		if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-			ac_cv_have_qt="have_qt=no"
-			ac_qt_notfound=""
-			if test "$ac_qt_includes" = NO; then
-				if test "$ac_qt_libraries" = NO; then
-					ac_qt_notfound="(headers and libraries)";
-				else
-					ac_qt_notfound="(headers)";
-				fi
+	else
+		echo "configure: failed program was:" >&AC_FD_CC
+		cat conftest.$ac_ext >&AC_FD_CC
+		ac_qt_libraries="NO"
+	fi
+	rm -f conftest*
+	CXXFLAGS="$ac_cxxflags_safe"
+	LDFLAGS="$ac_ldflags_safe"
+	LIBS="$ac_libs_safe"
+
+	AC_LANG_RESTORE
+
+	if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
+		have_qt=no
+		ac_qt_notfound=""
+		if test "$ac_qt_includes" = NO; then
+			if test "$ac_qt_libraries" = NO; then
+				ac_qt_notfound="(headers and libraries)";
 			else
-				ac_qt_notfound="(libraries)";
+				ac_qt_notfound="(headers)";
 			fi
-
-			AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! ]);
 		else
-			have_qt="yes"
+			ac_qt_notfound="(libraries)";
+		fi
+	else
+		have_qt="yes"
+	fi
+])
+
+
+AC_DEFUN(AC_PATH_QT_ANY,[
+
+	AC_MSG_CHECKING([for Qt])
+	AC_CACHE_VAL(ac_cv_have_qt,[
+		AC_TRY_PATH_QT(qt, single-threaded)
+		if test "$have_qt" != yes; then
+			AC_TRY_PATH_QT(qt-mt, multi-threaded)
+			if test "$have_qt" != yes; then
+				AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! ]);
+			fi
 		fi
+		ac_cv_have_qt="have_qt=$have_qt"
 	])
 
 	eval "$ac_cv_have_qt"
-
 	if test "$have_qt" != yes; then
 		AC_MSG_RESULT([$have_qt]);
 	else
@@ -152,7 +163,7 @@ AC_DEFUN(AC_PATH_QT_1_3,[
 		all_includes="$QT_INCLUDES $all_includes"
 	fi
 
-	if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
+	if test "$qt_libraries" = "$x_libraries" || test "$qt_libraries" = "/usr/lib" || test -z "$qt_libraries"; then
 		QT_LDFLAGS=""
 	else
 		QT_LDFLAGS="-L$qt_libraries"
@@ -163,6 +174,6 @@ AC_DEFUN(AC_PATH_QT_1_3,[
 	AC_SUBST(QT_LDFLAGS)
 	AC_PATH_QT_MOC
 
-	LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
+	LIB_QT='$(LIBQT) $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
 	AC_SUBST(LIB_QT)
 ])
diff --git a/conf/m4/kde/AC_PATH_QT_MOC.m4 b/conf/m4/kde/AC_PATH_QT_MOC.m4
index 7eee5d8..6635c2a 100644
--- a/conf/m4/kde/AC_PATH_QT_MOC.m4
+++ b/conf/m4/kde/AC_PATH_QT_MOC.m4
@@ -3,11 +3,16 @@ dnl Find the meta object compiler in the PATH, in $QTDIR/bin, and some
 dnl more usual places
 dnl ------------------------------------------------------------------------
 dnl
+AC_DEFUN(KDE_MOC_ERROR_MESSAGE,
+[
+	AC_MSG_ERROR([Could not find meta object compiler (moc)])
+])
+
 AC_DEFUN(AC_PATH_QT_MOC,
 [
    KDE_FIND_PATH(moc, MOC, [$ac_qt_bindir $QTDIR/bin $QTDIR/src/moc \
 	    /usr/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/lib/qt2/bin \
-	    /usr/local/qt/bin], [KDE_MOC_ERROR_MESSAGE])
+	    /usr/lib/qt3/bin /usr/local/qt/bin], [KDE_MOC_ERROR_MESSAGE])
 
    if test -z "$MOC"; then
      if test -n "$ac_cv_path_moc"; then
diff --git a/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4 b/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4
index c7477bb..1a6deaa 100644
--- a/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4
+++ b/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4
@@ -40,7 +40,7 @@ if test -n "$kde_use_extra_libs" && \
    for dir in $kde_use_extra_libs; do
      kde_extra_libs="$kde_extra_libs $dir"
      all_libraries="$all_libraries -L$dir"
-     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -rpath $dir"
+     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
      USER_LDFLAGS="$USER_LDFLAGS -L$dir"
    done
    IFS=$ac_save_ifs
diff --git a/conf/m4/plptools/PLP_CHECK_COMPILERS.m4 b/conf/m4/plptools/PLP_CHECK_COMPILERS.m4
index 278d5a8..bb43645 100644
--- a/conf/m4/plptools/PLP_CHECK_COMPILERS.m4
+++ b/conf/m4/plptools/PLP_CHECK_COMPILERS.m4
@@ -93,7 +93,7 @@ AC_DEFUN(PLP_CHECK_COMPILERS,
       esac
 
       if test "$plp_use_strict_options" = "yes"; then
-        CXXFLAGS="-ansi -pedantic -W -Wconversion -Wcast-qual -Wwrite-strings -Wbad-function-cast -Wshadow -Wcast-align $CXXFLAGS"
+        CXXFLAGS="-ansi -pedantic -W -Wconversion -Wcast-qual -Wwrite-strings -Wshadow -Wcast-align $CXXFLAGS"
       fi
     else
       CXXFLAGS="-O2 $CXXFLAGS"
diff --git a/kde2/kioslave/kio_plp.cpp b/kde2/kioslave/kio_plp.cpp
index 3e5981f..fb0a54a 100644
--- a/kde2/kioslave/kio_plp.cpp
+++ b/kde2/kioslave/kio_plp.cpp
@@ -24,13 +24,12 @@
 #include <config.h>
 #endif
 
-#include "kio_plp.h"
+#include <rfsvfactory.h>
+#include <rpcsfactory.h>
+#include <bufferarray.h>
 
 #include <iomanip>
-#include <stdio.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/stat.h>
+#include <string>
 
 #include <qfile.h>
 #include <qregexp.h>
@@ -41,11 +40,12 @@
 #include <klocale.h>
 #include <kconfig.h>
 
-#include <rfsvfactory.h>
-#include <rpcsfactory.h>
-#include <bufferarray.h>
+#include "kio_plp.h"
 
-#include <string>
+#include <stdio.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/stat.h>
 
 using namespace KIO;
 
@@ -1107,7 +1107,7 @@ special(const QByteArray &a) {
 	    char drv;
 
 	    stream >> param;
-	    cout << "p='" << param << "'" << endl;
+	    kdDebug(PLP_DEBUGAREA) << "p='" << param << "'" << endl;
 	    if (param.isEmpty()) {
 		error(ERR_MALFORMED_URL, i18n("(empty)"));
 		return;
diff --git a/kde2/klipsi/toplevel.cpp b/kde2/klipsi/toplevel.cpp
index 6f92e5a..d310515 100644
--- a/kde2/klipsi/toplevel.cpp
+++ b/kde2/klipsi/toplevel.cpp
@@ -40,10 +40,14 @@
 
 #include <psibitmap.h>
 
+#include <iostream>
+
 #define QUIT_ITEM    50
 #define ABOUT_ITEM    51
 #define CLIPFILE "C:/System/Data/Clpboard.cbd"
 
+using namespace std;
+
 TopLevel::TopLevel()
   : KMainWindow(0)
 {
diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp
index 3a162b5..161c715 100644
--- a/kde2/kpsion/kpsion.cpp
+++ b/kde2/kpsion/kpsion.cpp
@@ -55,8 +55,12 @@
 #include <bufferarray.h>
 #include <psiprocess.h>
 
+#include <iostream>
+
 #define STID_CONNECTION 1
 
+using namespace std;
+
 KPsionMainWindow::KPsionMainWindow()
     : KMainWindow() {
     setupActions();
diff --git a/kde2/kpsion/kpsion.h b/kde2/kpsion/kpsion.h
index 00423e5..925b09d 100644
--- a/kde2/kpsion/kpsion.h
+++ b/kde2/kpsion/kpsion.h
@@ -23,6 +23,10 @@
 #ifndef _KPSION_H_
 #define _KPSION_H_
 
+#include <rfsv.h>
+#include <rpcs.h>
+#include <ppsocket.h>
+
 // get KDE_VERSION
 #include <kapplication.h>
 
@@ -35,10 +39,6 @@
 #include <kiconview.h>
 #include <kdialogbase.h>
 
-#include <rfsv.h>
-#include <rpcs.h>
-#include <ppsocket.h>
-
 typedef QMap<char,QString> driveMap;
 typedef QMap<QString,QString> psionMap;
 
diff --git a/kde2/kpsion/kpsionconfig.cpp b/kde2/kpsion/kpsionconfig.cpp
index 3896a80..c4991e9 100644
--- a/kde2/kpsion/kpsionconfig.cpp
+++ b/kde2/kpsion/kpsionconfig.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kstddirs.h>
 
-#include <iostream.h>
+#include <iostream>
 
 KPsionConfig::KPsionConfig() {
     optionNames.insert(OPT_BACKUPDIR, QString("Settings/BackupDir"));
diff --git a/kde2/plugins/plpprops.cc b/kde2/plugins/plpprops.cc
index 065eaa4..47563e3 100644
--- a/kde2/plugins/plpprops.cc
+++ b/kde2/plugins/plpprops.cc
@@ -40,7 +40,7 @@
 #include <qwhatsthis.h>
 #include <qpushbutton.h>
 
-#include <strstream>
+#include <sstream>
 #include <iomanip>
 
 #ifdef ENABLE_NLS
@@ -937,9 +937,9 @@ void PlpMachinePage::slotJobData(KIO::Job *job, const QByteArray &data) {
 	d->machType->setText(KGlobal::locale()->translate(d->mi.machineType));
 	d->machName->setText(QString(d->mi.machineName));
 	// ??! None of QString's formatting methods knows about long long.
-	ostrstream s;
+	ostringstream s;
 	s << hex << setw(16) << d->mi.machineUID << '\0';
-	d->machUID->setText(QString(s.str()));
+	d->machUID->setText(QString(s.str().c_str()));
 	d->machLang->setText(KGlobal::locale()->translate(d->mi.uiLanguage));
 	d->dispGeo->setText(QString("%1x%2").arg(
 				d->mi.displayWidth).arg(d->mi.displayHeight));
@@ -980,9 +980,9 @@ void PlpMachinePage::slotJobData(KIO::Job *job, const QByteArray &data) {
 	d->machDST->setText((d->mi.tz.dst_zones & PsiTime::PSI_TZ_HOME)
 			    ? i18n("yes") : i18n("no"));
 
-	ostrstream mbs;
+	ostringstream mbs;
 	mbs << d->mi.mainBatteryUsedTime << '\0';
-	d->mbattUsage->setText(QString(mbs.str()));
+	d->mbattUsage->setText(QString(mbs.str().c_str()));
 	pt.setPsiTime(&d->mi.mainBatteryInsertionTime);
 	dt.setTime_t(pt.getTime());
 	d->mbattChanged->setText(KGlobal::locale()->formatDateTime(dt, false));
@@ -1010,9 +1010,9 @@ void PlpMachinePage::slotJobData(KIO::Job *job, const QByteArray &data) {
 	    QString("%1 mV").arg(KGlobal::locale()->formatNumber(
 				     d->mi.backupBatteryMaxVoltage, 0)));
 
-	ostrstream bbs;
+	ostringstream bbs;
 	bbs << d->mi.externalPowerUsedTime << '\0';
-	d->epowerUsage->setText(QString(bbs.str()));
+	d->epowerUsage->setText(QString(bbs.str().c_str()));
 	d->epowerSupplied->setText(
 	    d->mi.externalPower ? i18n("Yes") : i18n("No"));
     }
diff --git a/kde2/plugins/plppropsFactory.cc b/kde2/plugins/plppropsFactory.cc
index e9b6219..2eb8002 100644
--- a/kde2/plugins/plppropsFactory.cc
+++ b/kde2/plugins/plppropsFactory.cc
@@ -5,7 +5,7 @@
 #include "plppropsFactory.h"
 #include "plpprops.h"
 
-#include <stream.h>
+#include <iostream>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/lib/Enum.cc b/lib/Enum.cc
index 2c4142b..9e5b725 100644
--- a/lib/Enum.cc
+++ b/lib/Enum.cc
@@ -20,6 +20,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "Enum.h"
 
 using namespace std;
diff --git a/lib/Enum.h b/lib/Enum.h
index ba410f9..11a2371 100644
--- a/lib/Enum.h
+++ b/lib/Enum.h
@@ -27,11 +27,11 @@
 #include <config.h>
 #endif
 
-#include <plpintl.h>
-
 #include <map>
 #include <string>
 
+#include <plpintl.h>
+
 /**
  * the Base for the Enum template.
  * currently, only purpose is to provide a class type for mapping
diff --git a/lib/bufferarray.cc b/lib/bufferarray.cc
index 65f2acf..a060af6 100644
--- a/lib/bufferarray.cc
+++ b/lib/bufferarray.cc
@@ -21,9 +21,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-
-#include <stream.h>
-#include <iomanip.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "bufferstore.h"
 #include "bufferarray.h"
diff --git a/lib/bufferarray.h b/lib/bufferarray.h
index 59554e3..c3781b0 100644
--- a/lib/bufferarray.h
+++ b/lib/bufferarray.h
@@ -27,6 +27,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 class bufferStore;
 
 /**
diff --git a/lib/bufferstore.cc b/lib/bufferstore.cc
index 4712c45..17e4b9b 100644
--- a/lib/bufferstore.cc
+++ b/lib/bufferstore.cc
@@ -25,16 +25,17 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stream.h>
+
+#include "bufferstore.h"
+
 // Should be iostream.h, but won't build on Sun WorkShop C++ 5.0
 #include <iomanip>
+#include <string>
+
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <assert.h>
 
-#include "bufferstore.h"
-
 using namespace std;
 
 bufferStore::bufferStore()
diff --git a/lib/bufferstore.h b/lib/bufferstore.h
index 0e951b8..9472301 100644
--- a/lib/bufferstore.h
+++ b/lib/bufferstore.h
@@ -24,8 +24,9 @@
 #ifndef _BUFFERSTORE_H_
 #define _BUFFERSTORE_H_
 
+#include <iostream>
+
 #include <sys/types.h>
-#include <stream.h>
 
 /**
  * A generic container for an array of bytes.
diff --git a/lib/iowatch.cc b/lib/iowatch.cc
index 5a975f7..7c320f8 100644
--- a/lib/iowatch.cc
+++ b/lib/iowatch.cc
@@ -21,15 +21,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "iowatch.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <stream.h>
 #include <memory.h>
 
-#include "iowatch.h"
-
 IOWatch::IOWatch() {
     num = 0;
     io = new int [FD_SETSIZE];
diff --git a/lib/log.cc b/lib/log.cc
index fada4f5..6735fea 100644
--- a/lib/log.cc
+++ b/lib/log.cc
@@ -22,13 +22,14 @@
  *
  */
 #include "log.h"
+
 #include <unistd.h>
 
-logbuf::logbuf(int level, int fd) {
+logbuf::logbuf(int loglevel, int fd) {
     ptr = buf;
     len = 0;
     _on = true;
-    _level = level;
+    _level = loglevel;
     _fd = fd;
 }
 
diff --git a/lib/log.h b/lib/log.h
index 9f629e1..01ffe83 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -24,7 +24,8 @@
 #ifndef _LOG_H_
 #define _LOG_H_
 
-#include <ostream.h>
+#include <iostream>
+
 #include <syslog.h>
 
 /**
@@ -51,32 +52,32 @@
  * file. If it is omitted or set to -1, logging can be switched on
  * or off. The initial state is on.
  */
-class logbuf : public streambuf {
+class logbuf : public std::streambuf {
 public:
 
     /**
     * Constructs a new instance.
     *
-    * @param level The log level for this instance.
+    * @param loglevel The log level for this instance.
     * 	see syslog(3) for symbolic names to use.
     * @param fd An optional file descriptor to use
     *   if switched off.
     */
-    logbuf(int level, int fd = -1);
+    logbuf(int loglevel, int fd = -1);
 
     /**
     * Switches loggin on or off.
     *
-    * @param on The desired state.
+    * @param newstate The desired state.
     */
-    void setOn(bool on) { _on = on; }
+    void setOn(bool newstate) { _on = newstate; }
 
     /**
     * Modifies the loglevel of this instance.
     * 
-    * @param level The new loglevel.
+    * @param newlevel The new loglevel.
     */
-    void setLevel(int level) { _level = level; }
+    void setLevel(int newlevel) { _level = newlevel; }
 
     /**
     * Retrieve the current state.
diff --git a/lib/plpdirent.cc b/lib/plpdirent.cc
index 813e1d5..5d05bc6 100644
--- a/lib/plpdirent.cc
+++ b/lib/plpdirent.cc
@@ -21,7 +21,7 @@
  *
  */
 #include "plpdirent.h"
-#include <stream.h>
+
 #include <iomanip>
 
 using namespace std;
diff --git a/lib/plpdirent.h b/lib/plpdirent.h
index 5eeced7..a611225 100644
--- a/lib/plpdirent.h
+++ b/lib/plpdirent.h
@@ -23,7 +23,9 @@
 #ifndef _PLPDIRENT_H_
 #define _PLPDIRENT_H_
 
+#include <iostream>
 #include <string>
+
 #include <psitime.h>
 #include <rfsv.h>
 
@@ -175,7 +177,7 @@ public:
     * The output is in human readable similar to the
     * output of a "ls" command.
     */
-    friend ostream &operator<<(ostream &o, const PlpDirent &e);
+    friend std::ostream &operator<<(std::ostream &o, const PlpDirent &e);
 
 private:
     u_int32_t size;
diff --git a/lib/ppsocket.cc b/lib/ppsocket.cc
index 6632241..a624d8d 100644
--- a/lib/ppsocket.cc
+++ b/lib/ppsocket.cc
@@ -25,10 +25,15 @@
 #include "config.h"
 #endif
 
+#include "bufferstore.h"
+#include "ppsocket.h"
+#include "iowatch.h"
+
+#include <iostream>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <iostream.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
@@ -38,10 +43,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "bufferstore.h"
-#include "ppsocket.h"
-#include "iowatch.h"
-
 #define  INVALID_SOCKET	-1
 #define  SOCKET_ERROR	-1
 
diff --git a/lib/ppsocket.h b/lib/ppsocket.h
index 4abecca..b63f3a0 100644
--- a/lib/ppsocket.h
+++ b/lib/ppsocket.h
@@ -25,6 +25,7 @@
 #define _PPSOCKET_H_
 
 #include <string>
+
 #include <unistd.h>
 #include <netdb.h>
 #include <sys/socket.h>
diff --git a/lib/psibitmap.cpp b/lib/psibitmap.cpp
index ffe97ea..3dfd125 100644
--- a/lib/psibitmap.cpp
+++ b/lib/psibitmap.cpp
@@ -142,17 +142,17 @@ do {                                                \
 bool
 decodeBitmap(const unsigned char *p, int &width, int &height, bufferStore &out)
 {
-    u_int32_t totlen = *((u_int32_t*)p); p += 4;
-    u_int32_t hdrlen = *((u_int32_t*)p); p += 4;
+    u_int32_t totlen = *((const u_int32_t*)p); p += 4;
+    u_int32_t hdrlen = *((const u_int32_t*)p); p += 4;
     u_int32_t datlen = totlen - hdrlen;
-    u_int32_t xPixels = *((u_int32_t*)p); p += 4;
-    u_int32_t yPixels = *((u_int32_t*)p); p += 4;
-    u_int32_t xTwips = *((u_int32_t*)p); p += 4;
-    u_int32_t yTwips = *((u_int32_t*)p); p += 4;
-    u_int32_t bitsPerPixel = *((u_int32_t*)p); p += 4;
-    u_int32_t unknown1 = *((u_int32_t*)p); p += 4;
-    u_int32_t unknown2 = *((u_int32_t*)p); p += 4;
-    u_int32_t RLEflag = *((u_int32_t*)p); p += 4;
+    u_int32_t xPixels = *((const u_int32_t*)p); p += 4;
+    u_int32_t yPixels = *((const u_int32_t*)p); p += 4;
+    u_int32_t xTwips = *((const u_int32_t*)p); p += 4;
+    u_int32_t yTwips = *((const u_int32_t*)p); p += 4;
+    u_int32_t bitsPerPixel = *((const u_int32_t*)p); p += 4;
+    u_int32_t unknown1 = *((const u_int32_t*)p); p += 4;
+    u_int32_t unknown2 = *((const u_int32_t*)p); p += 4;
+    u_int32_t RLEflag = *((const u_int32_t*)p); p += 4;
 
     width = xPixels;
     height = yPixels;
diff --git a/lib/psiprocess.cc b/lib/psiprocess.cc
index d868820..ad1349d 100644
--- a/lib/psiprocess.cc
+++ b/lib/psiprocess.cc
@@ -21,8 +21,8 @@
  *
  */
 #include "psiprocess.h"
-#include <stream.h>
-#include <strstream>
+
+#include <sstream>
 #include <iomanip>
 
 using namespace std;
@@ -63,13 +63,13 @@ getArgs() {
 
 const char *PsiProcess::
 getProcId() {
-    ostrstream tmp;
+    ostringstream tmp;
 
     if (s5mx)
 	tmp << name << ".$" << setw(2) << setfill('0') << pid << '\0';
     else
 	tmp << name << ".$" << pid << '\0';
-    return tmp.str();
+    return tmp.str().c_str();
 }
 
 void PsiProcess::
diff --git a/lib/psiprocess.h b/lib/psiprocess.h
index 3e76d8e..f116119 100644
--- a/lib/psiprocess.h
+++ b/lib/psiprocess.h
@@ -24,7 +24,7 @@
 #define _PSIPROCESS_H_
 
 #include <string>
-#include <stream.h>
+#include <iostream>
 
 class rpcs;
 
diff --git a/lib/psitime.cc b/lib/psitime.cc
index 07b2d5a..61a74fa 100644
--- a/lib/psitime.cc
+++ b/lib/psitime.cc
@@ -21,11 +21,14 @@
  *
  */
 #include "psitime.h"
+#include "plp_inttypes.h"
+
 #include <stdlib.h>
-#include <plp_inttypes.h>
 
 #define OnePM 3600 // 13:00 offset for SIBO
 
+using namespace std;
+
 PsiTime::PsiTime(void) {
     ptzValid = false;
     tryPsiZone();
@@ -63,7 +66,7 @@ PsiTime::PsiTime(const u_int32_t _ptvHi, const u_int32_t _ptvLo) {
     psi2unix();
 }
 
-PsiTime::PsiTime(struct timeval *_utv, struct timezone *_utz = 0L) {
+PsiTime::PsiTime(struct timeval *_utv, struct timezone *_utz) {
     if (_utv != 0L)
 	utv = *_utv;
     if (_utz != 0L)
diff --git a/lib/psitime.h b/lib/psitime.h
index 79fd521..73a5c87 100644
--- a/lib/psitime.h
+++ b/lib/psitime.h
@@ -27,6 +27,8 @@
 #include <config.h>
 #endif
 
+#include <iostream>
+
 #if TIME_WITH_SYS_TIME
 #  include <sys/time.h>
 #  include <time.h>
@@ -41,7 +43,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <ostream.h>
 #include <plpintl.h>
 
 /**
@@ -54,8 +55,8 @@ typedef struct psi_timeval_t {
     /**
      * Prints a psi_timeval in human readable format.
      */
-    friend ostream &operator<<(ostream &o, const psi_timeval_t &ptv) {
-	ostream::fmtflags old = o.flags();
+    friend std::ostream &operator<<(std::ostream &o, const psi_timeval_t &ptv) {
+	std::ostream::fmtflags old = o.flags();
 	u_int64_t micro = ptv.tv_high;
 	micro = (micro << 32) | ptv.tv_low;
 	micro /= 1000000;
@@ -95,8 +96,8 @@ typedef struct psi_timeval_t {
  * holds a Psion time zone description.
  */
 typedef struct psi_timezone_t {
-    friend ostream &operator<<(ostream &s, const psi_timezone_t &ptz) {
-	ostream::fmtflags old = s.flags();
+    friend std::ostream &operator<<(std::ostream &s, const psi_timezone_t &ptz) {
+	std::ostream::fmtflags old = s.flags();
 	int h = ptz.utc_offset / 3600;
 	int m = ptz.utc_offset % 3600;
 	s << "offs: " << std::dec << h << "h";
@@ -291,7 +292,7 @@ public:
     *
     * @returns The stream.
     */
-    friend ostream &operator<<(ostream &s, const PsiTime &t);
+    friend std::ostream &operator<<(std::ostream &s, const PsiTime &t);
 
     /**
     * Assignment operator
@@ -310,7 +311,7 @@ public:
 	PSI_TZ_EUROPEAN = 1,
 	PSI_TZ_NORTHERN = 2,
 	PSI_TZ_SOUTHERN = 4,
-	PSI_TZ_HOME = 0x40000000,
+	PSI_TZ_HOME = 0x40000000
     };
 
 private:
diff --git a/lib/rclip.cc b/lib/rclip.cc
index 91870cc..09a6dde 100644
--- a/lib/rclip.cc
+++ b/lib/rclip.cc
@@ -24,18 +24,14 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
+#include "rclip.h"
+#include "bufferstore.h"
+#include "ppsocket.h"
+#include "bufferarray.h"
+#include "Enum.h"
+
 #include <stdlib.h>
-#include <fstream.h>
-#include <iomanip.h>
 #include <time.h>
-#include <string.h>
-
-#include <rclip.h>
-#include <bufferstore.h>
-#include <ppsocket.h>
-#include <bufferarray.h>
-#include <Enum.h>
 
 rclip::rclip(ppsocket * _skt)
 {
diff --git a/lib/rclip.h b/lib/rclip.h
index dd1563b..7bdeca0 100644
--- a/lib/rclip.h
+++ b/lib/rclip.h
@@ -143,7 +143,7 @@ protected:
     enum commands {
 	RCLIP_INIT   = 0x00,
 	RCLIP_NOTIFY = 0x08,
-	RCLIP_LISTEN = 0x04,
+	RCLIP_LISTEN = 0x04
     };
 
     /**
diff --git a/lib/rfsv.cc b/lib/rfsv.cc
index 017d743..bbc0a90 100644
--- a/lib/rfsv.cc
+++ b/lib/rfsv.cc
@@ -22,6 +22,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "rfsv.h"
 #include "ppsocket.h"
 #include "bufferstore.h"
diff --git a/lib/rfsv.h b/lib/rfsv.h
index 9b75b5e..fb48085 100644
--- a/lib/rfsv.h
+++ b/lib/rfsv.h
@@ -26,6 +26,7 @@
 
 #include <deque>
 #include <string>
+
 #include <Enum.h>
 #include <plpdirent.h>
 #include <bufferstore.h>
@@ -91,7 +92,7 @@ public:
     enum open_flags {
 	PSI_O_RDONLY = 0000,
 	PSI_O_WRONLY = 0001,
-	PSI_O_RDWR   = 0002,
+	PSI_O_RDWR   = 0002
     };
 
     /**
@@ -102,7 +103,7 @@ public:
 	PSI_O_EXCL   = 00200,
 	PSI_O_TRUNC  = 01000,
 	PSI_O_APPEND = 02000,
-	PSI_O_SHARE  = 04000,
+	PSI_O_SHARE  = 04000
     };
 
     /**
@@ -210,7 +211,7 @@ public:
 	PSI_A_READ       = 0x0200,
 	PSI_A_EXEC       = 0x0400,
 	PSI_A_STREAM     = 0x0800,
-	PSI_A_TEXT       = 0x1000,
+	PSI_A_TEXT       = 0x1000
     };
 
     virtual ~rfsv();
diff --git a/lib/rfsv16.cc b/lib/rfsv16.cc
index 09b78e2..afa9207 100644
--- a/lib/rfsv16.cc
+++ b/lib/rfsv16.cc
@@ -26,18 +26,17 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdlib.h>
-#include <fstream.h>
-#include <iomanip>
-#include <time.h>
-#include <string>
-
 #include "rfsv16.h"
 #include "bufferstore.h"
 #include "ppsocket.h"
 #include "bufferarray.h"
 
+#include <iostream>
+#include <fstream>
+
+#include <stdlib.h>
+#include <time.h>
+
 #define	RFSV16_MAXDATALEN	852	// 640
 
 using namespace std;
@@ -347,7 +346,6 @@ devlist(u_int32_t &devbits)
 	return status;
 
     while (1) {
-	bufferStore a;
 	a.init();
 	a.addWord(fileHandle & 0xFFFF);
 	if (!sendCommand(FDEVICEREAD, a))
diff --git a/lib/rfsv32.cc b/lib/rfsv32.cc
index ae12711..2574926 100644
--- a/lib/rfsv32.cc
+++ b/lib/rfsv32.cc
@@ -25,19 +25,18 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdlib.h>
-#include <fstream>
-#include <iomanip>
-#include <time.h>
-#include <string>
-
 #include "rfsv32.h"
 #include "bufferstore.h"
 #include "ppsocket.h"
 #include "bufferarray.h"
 #include "plpdirent.h"
 
+#include <iostream>
+#include <fstream>
+
+#include <stdlib.h>
+#include <time.h>
+
 using namespace std;
 
 rfsv32::rfsv32(ppsocket * _skt)
@@ -856,14 +855,14 @@ static enum rfsv::errs e2psi[] = {
 };
 
 Enum<rfsv::errs> rfsv32::
-err2psierr(int32_t status)
+err2psierr(int32_t istatus)
 {
-    if ((status > E_EPOC_NONE) || (status < E_EPOC_DIR_FULL)) {
-	cerr << "FATAL: inavlid error-code" << endl;
-	cerr << "status: " << status << " " << hex << status << endl;
+    if ((istatus > E_EPOC_NONE) || (istatus < E_EPOC_DIR_FULL)) {
+	cerr << "FATAL: invalid error-code" << endl;
+	cerr << "status: " << istatus << " " << hex << istatus << endl;
 	return E_PSI_INTERNAL;
     }
-    return e2psi[status - E_EPOC_DIR_FULL];
+    return e2psi[istatus - E_EPOC_DIR_FULL];
 }
 
 
diff --git a/lib/rfsvfactory.cc b/lib/rfsvfactory.cc
index 46de414..f525e5d 100644
--- a/lib/rfsvfactory.cc
+++ b/lib/rfsvfactory.cc
@@ -24,13 +24,6 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdlib.h>
-#include <fstream.h>
-#include <iomanip.h>
-#include <time.h>
-#include <string.h>
-
 #include "rfsv.h"
 #include "rfsv16.h"
 #include "rfsv32.h"
@@ -39,6 +32,9 @@
 #include "ppsocket.h"
 #include "Enum.h"
 
+#include <stdlib.h>
+#include <time.h>
+
 using namespace std;
 
 ENUM_DEFINITION(rfsvfactory::errs, rfsvfactory::FACERR_NONE) {
diff --git a/lib/rfsvfactory.h b/lib/rfsvfactory.h
index add4a20..a4f8918 100644
--- a/lib/rfsvfactory.h
+++ b/lib/rfsvfactory.h
@@ -45,7 +45,7 @@ public:
 	FACERR_AGAIN = 2,
 	FACERR_NOPSION = 3,
 	FACERR_PROTVERSION = 4,
-	FACERR_NORESPONSE = 5,
+	FACERR_NORESPONSE = 5
     };
 
     /**
diff --git a/lib/rpcs.cc b/lib/rpcs.cc
index 4a310f0..48298b8 100644
--- a/lib/rpcs.cc
+++ b/lib/rpcs.cc
@@ -24,14 +24,6 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream.h>
-#include <iomanip.h>
-#include <time.h>
-#include <string.h>
-
 #include "rpcs.h"
 #include "bufferstore.h"
 #include "ppsocket.h"
@@ -39,6 +31,10 @@
 #include "psiprocess.h"
 #include "Enum.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
 using namespace std;
 
 ENUM_DEFINITION(rpcs::machs, rpcs::PSI_MACH_UNKNOWN) {
@@ -387,23 +383,20 @@ getOwnerInfo(bufferArray &owner)
     if ((res = (enum rfsv::errs)getResponse(a, true)) != rfsv::E_PSI_GEN_NONE)
 	return res;
     a.addByte(0);
-    int l = a.getLen();
-    char *s = (char *)a.getString(0);
-    for (int i = 0; i < l; i++)
-	if (s[i] == 6)
-	    s[i] = 0;
+    string s = a.getString(0);
     owner.clear();
-    while (l > 0) {
-	if (*s != '\0') {
-	    bufferStore b;
-	    b.addStringT(s);
-	    owner += b;
-	    l -= (strlen(s) + 1);
-	    s += (strlen(s) + 1);
-	} else {
-	    l--;
-	    s++;
-	}
+    int p = 0;
+    int l;
+    while ((l = s.find('\006', p)) != s.npos) {
+	bufferStore b;
+	b.addStringT(s.substr(p, l - p).c_str());
+	owner += b;
+	p = l + 1;
+    }
+    if (s.substr(p).length()) {
+	bufferStore b;
+	b.addStringT(s.substr(p).c_str());
+	owner += b;
     }
     return res;
 }
diff --git a/lib/rpcs.h b/lib/rpcs.h
index 5834afa..de3004f 100644
--- a/lib/rpcs.h
+++ b/lib/rpcs.h
@@ -23,12 +23,13 @@
 #ifndef _RPCS_H_
 #define _RPCS_H_
 
-#include <vector>
 #include <psitime.h>
 #include <psiprocess.h>
 #include <rfsv.h>
 #include <Enum.h>
 
+#include <vector>
+
 class ppsocket;
 class bufferStore;
 class bufferArray;
@@ -66,7 +67,7 @@ public:
 	PSI_MACH_SIENNA = 7,
 	PSI_MACH_S3C = 8,
 	PSI_MACH_S5 = 32,
-	PSI_MACH_WINC = 33,
+	PSI_MACH_WINC = 33
 	// TODO: Code for 5mx
     };
 
@@ -102,7 +103,7 @@ public:
 	PSI_LANG_cs_CZ	= 25,
 	PSI_LANG_sk_SK	= 26,
 	PSI_LANG_pl_PL	= 27,
-	PSI_LANG_sl_SI	= 28,
+	PSI_LANG_sl_SI	= 28
     };
 
     /**
@@ -112,7 +113,7 @@ public:
 	PSI_BATT_DEAD = 0,
 	PSI_BATT_VERYLOW = 1,
 	PSI_BATT_LOW = 2,
-	PSI_BATT_GOOD = 3,
+	PSI_BATT_GOOD = 3
     };
 
     /**
diff --git a/lib/rpcs16.cc b/lib/rpcs16.cc
index 3a2b59a..603fcb9 100644
--- a/lib/rpcs16.cc
+++ b/lib/rpcs16.cc
@@ -25,19 +25,15 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream.h>
-#include <iomanip.h>
-#include <time.h>
-#include <string.h>
-
 #include "rpcs16.h"
 #include "bufferstore.h"
 #include "bufferarray.h"
 #include "ppsocket.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
 using namespace std;
 
 rpcs16::rpcs16(ppsocket * _skt)
diff --git a/lib/rpcs32.cc b/lib/rpcs32.cc
index b8874f1..0e9122c 100644
--- a/lib/rpcs32.cc
+++ b/lib/rpcs32.cc
@@ -24,19 +24,17 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream.h>
-#include <iomanip.h>
-#include <time.h>
-#include <string.h>
-
 #include "rpcs32.h"
 #include "bufferstore.h"
 #include "bufferarray.h"
 #include "ppsocket.h"
 
+#include <iostream>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
 using namespace std;
 
 rpcs32::rpcs32(ppsocket * _skt)
diff --git a/lib/rpcsfactory.cc b/lib/rpcsfactory.cc
index 0861c2c..25a069c 100644
--- a/lib/rpcsfactory.cc
+++ b/lib/rpcsfactory.cc
@@ -24,21 +24,16 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdlib.h>
-#include <fstream.h>
-#include <iomanip.h>
-#include <time.h>
-#include <string.h>
-
 #include "rpcs16.h"
 #include "rpcs32.h"
 #include "rpcsfactory.h"
 #include "bufferstore.h"
 #include "ppsocket.h"
-
 #include "Enum.h"
 
+#include <stdlib.h>
+#include <time.h>
+
 ENUM_DEFINITION(rpcsfactory::errs, rpcsfactory::FACERR_NONE) {
     stringRep.add(rpcsfactory::FACERR_NONE,           N_("no error"));
     stringRep.add(rpcsfactory::FACERR_COULD_NOT_SEND, N_("could not send version request"));
diff --git a/lib/rpcsfactory.h b/lib/rpcsfactory.h
index c00388c..614695a 100644
--- a/lib/rpcsfactory.h
+++ b/lib/rpcsfactory.h
@@ -44,7 +44,7 @@ class rpcsfactory {
 	FACERR_AGAIN = 2,
 	FACERR_NOPSION = 3,
 	FACERR_PROTVERSION = 4,
-	FACERR_NORESPONSE = 5,
+	FACERR_NORESPONSE = 5
     };
 
     /**
diff --git a/lib/siscomponentrecord.cpp b/lib/siscomponentrecord.cpp
index ac5ba6d..de382ad 100644
--- a/lib/siscomponentrecord.cpp
+++ b/lib/siscomponentrecord.cpp
@@ -83,10 +83,10 @@ SISComponentNameRecord::fillFrom(uint8_t* buf, int* basePos, off_t len,
 				   sisFile->getLanguage(i)->m_name,
 				   m_nameLengths[i],
 				   buf + m_namePtrs[i]);
-		int len = m_nameLengths[i];
-		m_names[i] = new uint8_t[len + 1];
-		memcpy(m_names[i], buf + m_namePtrs[i], len);
-		m_names[i][len] = 0;
+		int nlen = m_nameLengths[i];
+		m_names[i] = new uint8_t[nlen + 1];
+		memcpy(m_names[i], buf + m_namePtrs[i], nlen);
+		m_names[i][nlen] = 0;
 		}
 	if (logLevel >= 1)
 		printf(_("%d .. %d (%d bytes): Name records\n"), base, base + size, size);
diff --git a/lib/siscomponentrecord.h b/lib/siscomponentrecord.h
index 1fc4ff3..1495c74 100644
--- a/lib/siscomponentrecord.h
+++ b/lib/siscomponentrecord.h
@@ -23,7 +23,7 @@
 #ifndef _SISCOMPONENTRECORD_H
 #define _SISCOMPONENTRECORD_H
 
-#include "sistypes.h"
+#include <sistypes.h>
 
 class SISFile;
 
diff --git a/lib/sisfile.h b/lib/sisfile.h
index bb33570..7a9d6da 100644
--- a/lib/sisfile.h
+++ b/lib/sisfile.h
@@ -23,9 +23,9 @@
 #ifndef _SISFILE_H
 #define _SISFILE_H
 
-#include "sistypes.h"
-#include "sisfileheader.h"
-#include "siscomponentrecord.h"
+#include <sistypes.h>
+#include <sisfileheader.h>
+#include <siscomponentrecord.h>
 
 class SISLangRecord;
 class SISFileRecord;
diff --git a/lib/sisfileheader.h b/lib/sisfileheader.h
index 0c2d635..ba32cb5 100644
--- a/lib/sisfileheader.h
+++ b/lib/sisfileheader.h
@@ -23,7 +23,7 @@
 #ifndef _SISFILEHEADER_H
 #define _SISFILEHEADER_H
 
-#include "sistypes.h"
+#include <sistypes.h>
 
 /**
  * The first part of a SISFile.
@@ -62,21 +62,23 @@ public:
 
 	enum FileOptions {
 		op_isUnicode = 1,
-		op_isDistributable = 2,
+		op_isDistributable = 2
 #ifdef EPOC6
+		,
 		op_noCompress = 8,
-		op_shutdownApps = 16,
+		op_shutdownApps = 16
 #endif
 	};
 
 	enum FileType {
-		FT_App = 0,
+		FT_App = 0
 #ifdef EPOC6
+		,
 		FT_System = 1,
 		FT_Option = 2,
 		FT_Config = 3,
 		FT_Patch = 4,
-		FT_Upgrade = 5,
+		FT_Upgrade = 5
 #endif
 	};
 
diff --git a/lib/sisfilerecord.h b/lib/sisfilerecord.h
index 96a5f2a..6c0e641 100644
--- a/lib/sisfilerecord.h
+++ b/lib/sisfilerecord.h
@@ -23,7 +23,7 @@
 #ifndef _SISFILERECORD_H
 #define _SISFILERECORD_H
 
-#include "sistypes.h"
+#include <sistypes.h>
 
 class SISFile;
 
diff --git a/lib/sislangrecord.h b/lib/sislangrecord.h
index 4b6e7ae..89b1af0 100644
--- a/lib/sislangrecord.h
+++ b/lib/sislangrecord.h
@@ -23,7 +23,7 @@
 #ifndef _SISLANGRECORD_H
 #define _SISLANGRECORD_H
 
-#include "sistypes.h"
+#include <sistypes.h>
 
 /**
  * A simple language record, only containing the epoc specific 16 bit
diff --git a/lib/sisreqrecord.h b/lib/sisreqrecord.h
index 12bf535..89762ea 100644
--- a/lib/sisreqrecord.h
+++ b/lib/sisreqrecord.h
@@ -23,7 +23,7 @@
 #ifndef _SISREQRECORD_H
 #define _SISREQRECORD_H
 
-#include "sistypes.h"
+#include <sistypes.h>
 
 class SISFile;
 
diff --git a/lib/sistypes.h b/lib/sistypes.h
index 131c4dc..04c94cc 100644
--- a/lib/sistypes.h
+++ b/lib/sistypes.h
@@ -23,7 +23,7 @@
 #ifndef _SISTYPES_H
 #define _SISTYPES_H
 
-#include "plp_inttypes.h"
+#include <plp_inttypes.h>
 
 /**
  * Return Codes.
@@ -38,7 +38,7 @@ enum SisRC {
 	SIS_DIFFERENT_APP,
 	SIS_VER_EARLIER,
 	SIS_SAME_OR_LATER,
-	SIS_OTHER_VARIANT,
+	SIS_OTHER_VARIANT
 };
 
 extern uint16_t read16(uint8_t* p);
@@ -61,7 +61,7 @@ struct LangTableEntry
 {
 	uint16_t m_no;
 	char   m_code[3];
-	char*  m_name;
+	const char*  m_name;
 };
 
 extern LangTableEntry langTable[];
diff --git a/lib/wprt.cc b/lib/wprt.cc
index 42d0308..5ba2f86 100644
--- a/lib/wprt.cc
+++ b/lib/wprt.cc
@@ -24,19 +24,19 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
-#include <stdlib.h>
-#include <fstream.h>
-#include <iomanip.h>
-#include <time.h>
-#include <string.h>
-
 #include "wprt.h"
 #include "bufferstore.h"
 #include "ppsocket.h"
 #include "bufferarray.h"
 #include "Enum.h"
 
+#include <iostream>
+
+#include <stdlib.h>
+#include <time.h>
+
+using namespace std;
+
 wprt::wprt(ppsocket * _skt)
 {
     skt = _skt;
diff --git a/lib/wprt.h b/lib/wprt.h
index 755c2b9..a978f20 100644
--- a/lib/wprt.h
+++ b/lib/wprt.h
@@ -93,7 +93,7 @@ protected:
 	WPRT_INIT    = 0x00,
 	WPRT_GET     = 0xf0,
 	WPRT_CANCEL  = 0xf1,
-	WPRT_STOP    = 0xff,
+	WPRT_STOP    = 0xff
     };
 
     /**
diff --git a/ncpd/channel.cc b/ncpd/channel.cc
index d3189e4..5401499 100644
--- a/ncpd/channel.cc
+++ b/ncpd/channel.cc
@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stream.h>
+#include <iostream>
 #include <string>
 
 #include "channel.h"
diff --git a/ncpd/link.cc b/ncpd/link.cc
index 9aab182..84c1d89 100644
--- a/ncpd/link.cc
+++ b/ncpd/link.cc
@@ -25,18 +25,20 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
+#include <iostream>
+
+#include <bufferstore.h>
+#include <bufferarray.h>
+#include <plp_inttypes.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/time.h>
-#include <plp_inttypes.h>
 
 #include "link.h"
 #include "packet.h"
 #include "ncp.h"
-#include "bufferstore.h"
-#include "bufferarray.h"
 #include "main.h"
 
 extern "C" {
diff --git a/ncpd/linkchan.cc b/ncpd/linkchan.cc
index aa21bb1..7c2a231 100644
--- a/ncpd/linkchan.cc
+++ b/ncpd/linkchan.cc
@@ -21,14 +21,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include <stream.h>
 #include <iomanip>
 #include <string>
 
+#include <bufferstore.h>
+#include <bufferarray.h>
+
 #include "linkchan.h"
 #include "ncp.h"
-#include "bufferstore.h"
-#include "bufferarray.h"
 #include "main.h"
 
 using namespace std;
diff --git a/ncpd/main.cc b/ncpd/main.cc
index 7f2ff3e..4d0595e 100644
--- a/ncpd/main.cc
+++ b/ncpd/main.cc
@@ -25,9 +25,15 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
 #include <string>
-#include <stream.h>
+#include <iostream>
+
+#include <bufferstore.h>
+#include <ppsocket.h>
+#include <iowatch.h>
+#include <log.h>
+
+#include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
@@ -38,14 +44,10 @@
 #include <plpintl.h>
 
 #include "ncp.h"
-#include "bufferstore.h"
-#include "ppsocket.h"
 #include "socketchan.h"
-#include "iowatch.h"
 #include "linkchan.h"
 #include "link.h"
 #include "packet.h"
-#include "log.h"
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
diff --git a/ncpd/main.h b/ncpd/main.h
index 1af2c9a..ef45414 100644
--- a/ncpd/main.h
+++ b/ncpd/main.h
@@ -24,7 +24,7 @@
 #ifndef _main_h_
 #define _main_h_
 
-#include <ostream.h>
+#include <iostream>
 
 extern std::ostream lout;
 extern std::ostream lerr;
diff --git a/ncpd/mp_serial.h b/ncpd/mp_serial.h
index da559e4..40d465f 100644
--- a/ncpd/mp_serial.h
+++ b/ncpd/mp_serial.h
@@ -24,8 +24,14 @@
 #ifndef _mp_serial_h
 #define _mp_serial_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 int init_serial(const char *dev, int speed, int debug);
 void ser_exit(int fd);
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 
diff --git a/ncpd/ncp.cc b/ncpd/ncp.cc
index 3507804..1bc39a3 100644
--- a/ncpd/ncp.cc
+++ b/ncpd/ncp.cc
@@ -25,8 +25,9 @@
 #include <config.h>
 #endif
 
-#include <stream.h>
+#include <iostream>
 #include <string>
+
 #include <time.h>
 
 #include <bufferstore.h>
diff --git a/ncpd/packet.cc b/ncpd/packet.cc
index d352fc9..48f2a5e 100644
--- a/ncpd/packet.cc
+++ b/ncpd/packet.cc
@@ -25,22 +25,21 @@
 #include <config.h>
 #endif
 
+#include <string>
+#include <fstream>
+#include <iomanip>
+
 #include <stdio.h>
 #include <malloc.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <string>
-#include <fstream>
-#include <iomanip>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <signal.h>
 
-extern "C" {
 #include "mp_serial.h"
-}
 #include "packet.h"
 #include "link.h"
 #include "main.h"
diff --git a/ncpd/socketchan.cc b/ncpd/socketchan.cc
index d0b22bf..0d74549 100644
--- a/ncpd/socketchan.cc
+++ b/ncpd/socketchan.cc
@@ -24,17 +24,20 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stream.h>
+
+#include <string>
+
+#include <ppsocket.h>
+#include <rfsv.h>
+
 #include <stdio.h>
-#include <string.h>
 #include <malloc.h>
 
 #include "socketchan.h"
 #include "ncp.h"
-#include <ppsocket.h>
-#include <rfsv.h>
+#include "main.h"
 
-extern std::ostream lerr;
+using namespace std;
 
 socketChan:: socketChan(ppsocket * _skt, ncp * _ncpController):
     channel(_ncpController)
diff --git a/plpbackup/plpbackup.cc b/plpbackup/plpbackup.cc
index 6570603..1dde5e6 100644
--- a/plpbackup/plpbackup.cc
+++ b/plpbackup/plpbackup.cc
@@ -25,15 +25,26 @@
 #include <config.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <dirent.h>
 #include <fstream>
-#include <strstream>
+#include <sstream>
+#include <iostream>
 #include <iomanip>
 #include <vector>
 #include <set>
 
+#include <plpintl.h>
+#include <ppsocket.h>
+#include <rfsv.h>
+#include <rfsvfactory.h>
+#include <rpcs.h>
+#include <rpcsfactory.h>
+#include <bufferstore.h>
+#include <bufferarray.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <dirent.h>
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,15 +57,6 @@
 #include <getopt.h>
 #include <fcntl.h>
 
-#include <plpintl.h>
-#include <ppsocket.h>
-#include <rfsv.h>
-#include <rfsvfactory.h>
-#include <rpcs.h>
-#include <rpcsfactory.h>
-#include <bufferstore.h>
-#include <bufferarray.h>
-
 using namespace std;
 
 bool full = false;
@@ -295,10 +297,10 @@ startPrograms() {
 			int i;
 			for (i = 0; i < 26; i++) {
 			    if (devbits & 1) {
-				ostrstream tmp;
+				ostringstream tmp;
 				tmp << 'A' + i << "\\System\\Apps\\"
 				    << cmd << "\\" << cmd << ".app";
-				res = Rpcs->execProgram(tmp.str(), "");
+				res = Rpcs->execProgram(tmp.str().c_str(), "");
 			    }
 			    if (res == rfsv::E_PSI_GEN_NONE)
 				break;
@@ -867,7 +869,7 @@ runRestore()
 {
     unsigned int i;
     char indexbuf[40];
-    ostrstream tarcmd;
+    ostringstream tarcmd;
     string dstPath;
     struct timeval start_tv, end_tv, cstart_tv, cend_tv;
 
@@ -875,7 +877,7 @@ runRestore()
 	tarcmd << "tar --to-stdout -xzf " << archList[i]
 	       << " 'KPsion*Index'" << ends;
 	char backupType = '?';
-	FILE *f = popen(tarcmd.str(), "r");
+	FILE *f = popen(tarcmd.str().c_str(), "r");
 	if (!f) {
 	    perror(_("Could not get backup index"));
 	    continue;
@@ -932,7 +934,7 @@ runRestore()
 		tarcmd << "tar xzCf " << dstPath << " " << fn << ends;
 		if (verbose > 0)
 		    cout << _("Extracting tar archive ...") << endl;
-		if (system(tarcmd.str()) != 0)
+		if (system(tarcmd.str().c_str()) != 0)
 		    cerr << _("Execution of ") << tarcmd.str() << _(" failed.")
 			 << endl;
 		continue;
@@ -1340,7 +1342,7 @@ runBackup()
 
 	// tar it all up
 	if (!bErr) {
-	    ostrstream tarcmd;
+	    ostringstream tarcmd;
 
 	    if (verbose > 0)
 		cout << _("Creating tar archive ...") << endl;
@@ -1355,7 +1357,7 @@ runBackup()
 	    tarcmd << ends;
 
 	    mkdirp(archPath.c_str());
-	    if (system(tarcmd.str())) {
+	    if (system(tarcmd.str().c_str())) {
 		cerr << _("plpbackup: Error during execution of ")
 		     << tarcmd.str() << endl;
 		unlink(archPath.c_str());
diff --git a/plpftp/ftp.cc b/plpftp/ftp.cc
index d4e153d..17afbbd 100644
--- a/plpftp/ftp.cc
+++ b/plpftp/ftp.cc
@@ -27,26 +27,28 @@
 #include "config.h"
 #endif
 
+#include <plpintl.h>
+#include <rfsv.h>
+#include <rpcs.h>
+#include <bufferarray.h>
+#include <bufferstore.h>
+#include <Enum.h>
+
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <iomanip>
+
 #include <sys/types.h>
 #include <dirent.h>
-#include <stream.h>
-#include <fstream.h>
-#include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <iomanip.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <signal.h>
 
-#include <plpintl.h>
-#include <rfsv.h>
-#include <rpcs.h>
-#include <bufferarray.h>
-#include <bufferstore.h>
-#include <Enum.h>
 #include "ftp.h"
 
 #if HAVE_LIBREADLINE
diff --git a/plpftp/main.cc b/plpftp/main.cc
index ad7fe01..24fcead 100644
--- a/plpftp/main.cc
+++ b/plpftp/main.cc
@@ -25,11 +25,6 @@
 #include <config.h>
 #endif
 
-#include <stream.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
 #include <plpintl.h>
 #include <ppsocket.h>
 #include <rfsv.h>
@@ -38,6 +33,12 @@
 #include <rpcsfactory.h>
 #include <bufferstore.h>
 
+#include <iostream>
+#include <string>
+
+#include <stdlib.h>
+#include <stdio.h>
+
 #include "ftp.h"
 
 #ifndef _GNU_SOURCE
@@ -45,6 +46,8 @@
 #endif
 #include <getopt.h>
 
+using namespace std;
+
 static void
 help()
 {
diff --git a/plpnfsd/main.cc b/plpnfsd/main.cc
index c622bd3..6850cd9 100644
--- a/plpnfsd/main.cc
+++ b/plpnfsd/main.cc
@@ -24,29 +24,31 @@
 #include <config.h>
 #endif
 
-#include <stream.h>
-#include <string.h>
+#include <rfsv.h>
+#include <rpcs.h>
+#include <rfsvfactory.h>
+#include <rpcsfactory.h>
+#include <bufferstore.h>
+#include <bufferarray.h>
+#include <ppsocket.h>
+
+#include <iostream>
+#include <string>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <syslog.h>
 
-#include "rfsv.h"
-#include "rpcs.h"
-#include "rfsvfactory.h"
-#include "rpcsfactory.h"
-#include "bufferstore.h"
-#include "bufferarray.h"
-#include "ppsocket.h"
-extern "C" {
 #include "rfsv_api.h"
-}
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 #include <getopt.h>
 
+using namespace std;
+
 static rfsv *a;
 static rfsvfactory *rf;
 static char *a_filename = 0;
diff --git a/plpnfsd/rfsv_api.h b/plpnfsd/rfsv_api.h
index d93b9d1..934c5fe 100644
--- a/plpnfsd/rfsv_api.h
+++ b/plpnfsd/rfsv_api.h
@@ -23,6 +23,10 @@
 #ifndef _rfsv_api_h_
 #define _rfsv_api_h_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "mp.h"
 #include "builtins.h"
 
@@ -64,6 +68,10 @@ extern long rpcs_ps();
 #define PSI_A_STREAM		0x0800
 #define PSI_A_TEXT		0x1000
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /*
diff --git a/plpprint/plpprintd.cc b/plpprint/plpprintd.cc
index 5898d64..73bd813 100644
--- a/plpprint/plpprintd.cc
+++ b/plpprint/plpprintd.cc
@@ -24,8 +24,13 @@
 #include <config.h>
 #endif
 
-#include <stream.h>
-#include <string.h>
+#include <ppsocket.h>
+#include <wprt.h>
+#include <psibitmap.h>
+
+#include <iostream>
+#include <string>
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -35,10 +40,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <ppsocket.h>
-#include <wprt.h>
-#include <psibitmap.h>
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
diff --git a/po/de.po b/po/de.po
index 71e9e57..71bf180 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plptools 0.11\n"
-"POT-Creation-Date: 2003-02-01 00:01+0100\n"
+"POT-Creation-Date: 2003-02-05 07:33+0100\n"
 "PO-Revision-Date: 2002-07-16 21:39 CET\n"
 "Last-Translator: Fritz Elfert <felfert@to.com>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -14,537 +14,537 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: lib/rfsv.cc:33 lib/rpcsfactory.cc:43 lib/rfsvfactory.cc:45
+#: lib/rfsv.cc:37 lib/rpcsfactory.cc:38 lib/rfsvfactory.cc:41
 msgid "no error"
 msgstr "kein Fehler"
 
-#: lib/rfsv.cc:34
+#: lib/rfsv.cc:38
 msgid "general"
 msgstr "allgemein"
 
-#: lib/rfsv.cc:35
+#: lib/rfsv.cc:39
 msgid "bad argument"
 msgstr "fehlerhaftes Argument"
 
-#: lib/rfsv.cc:36
+#: lib/rfsv.cc:40
 msgid "OS error"
 msgstr "BS Fehler"
 
-#: lib/rfsv.cc:37
+#: lib/rfsv.cc:41
 msgid "not supported"
 msgstr "nicht unterstützt"
 
-#: lib/rfsv.cc:38
+#: lib/rfsv.cc:42
 msgid "numeric underflow"
 msgstr "numerischer Unterlauf"
 
-#: lib/rfsv.cc:39
+#: lib/rfsv.cc:43
 msgid "numeric overflow"
 msgstr "numerischer Ãœberlauf"
 
-#: lib/rfsv.cc:40
+#: lib/rfsv.cc:44
 msgid "numeric exception"
 msgstr "numerische Ausnahme"
 
-#: lib/rfsv.cc:41
+#: lib/rfsv.cc:45
 msgid "in use"
 msgstr "in Verwendung"
 
-#: lib/rfsv.cc:42
+#: lib/rfsv.cc:46
 msgid "out of memory"
 msgstr "kein Speicher"
 
-#: lib/rfsv.cc:43
+#: lib/rfsv.cc:47
 msgid "out of segments"
 msgstr "keine Segmente"
 
-#: lib/rfsv.cc:44
+#: lib/rfsv.cc:48
 msgid "out of semaphores"
 msgstr "keine Semaphoren"
 
-#: lib/rfsv.cc:45
+#: lib/rfsv.cc:49
 msgid "out of processes"
 msgstr "keine Prozesse"
 
-#: lib/rfsv.cc:46
+#: lib/rfsv.cc:50
 msgid "already open"
 msgstr "bereits geöffnet"
 
-#: lib/rfsv.cc:47
+#: lib/rfsv.cc:51
 msgid "not open"
 msgstr "nicht geöffnet"
 
-#: lib/rfsv.cc:48
+#: lib/rfsv.cc:52
 msgid "bad image"
 msgstr "fehlerhaftes Abbild"
 
-#: lib/rfsv.cc:49
+#: lib/rfsv.cc:53
 msgid "receiver error"
 msgstr "Empfangsfehler"
 
-#: lib/rfsv.cc:50
+#: lib/rfsv.cc:54
 msgid "device error"
 msgstr "Gerätefehler"
 
-#: lib/rfsv.cc:51
+#: lib/rfsv.cc:55
 msgid "no filesystem"
 msgstr "kein Dateisystem"
 
-#: lib/rfsv.cc:52
+#: lib/rfsv.cc:56
 msgid "not ready"
 msgstr "nicht bereit"
 
-#: lib/rfsv.cc:53
+#: lib/rfsv.cc:57
 msgid "no font"
 msgstr "kein Zeichensatz"
 
-#: lib/rfsv.cc:54
+#: lib/rfsv.cc:58
 msgid "too wide"
 msgstr "zu breit"
 
-#: lib/rfsv.cc:55
+#: lib/rfsv.cc:59
 msgid "too many"
 msgstr "zu viele"
 
-#: lib/rfsv.cc:56
+#: lib/rfsv.cc:60
 msgid "file already exists"
 msgstr "Datei existiert bereits"
 
-#: lib/rfsv.cc:57
+#: lib/rfsv.cc:61
 msgid "no such file"
 msgstr "keine solche Datei"
 
-#: lib/rfsv.cc:58
+#: lib/rfsv.cc:62
 msgid "write error"
 msgstr "Schreibfehler"
 
-#: lib/rfsv.cc:59
+#: lib/rfsv.cc:63
 msgid "read error"
 msgstr "Lesefehler"
 
-#: lib/rfsv.cc:60
+#: lib/rfsv.cc:64
 msgid "end of file"
 msgstr "Ende der Datei"
 
-#: lib/rfsv.cc:61
+#: lib/rfsv.cc:65
 msgid "disk/serial read buffer full"
 msgstr "Platte/serieller Lesepuffer voll"
 
-#: lib/rfsv.cc:62
+#: lib/rfsv.cc:66
 msgid "invalid name"
 msgstr "ungültiger Name"
 
-#: lib/rfsv.cc:63
+#: lib/rfsv.cc:67
 msgid "access denied"
 msgstr "Zugriff verweigert"
 
-#: lib/rfsv.cc:64
+#: lib/rfsv.cc:68
 msgid "resource locked"
 msgstr "Ressource gesperrt"
 
-#: lib/rfsv.cc:65
+#: lib/rfsv.cc:69
 msgid "no such device"
 msgstr "Kein solches Gerät"
 
-#: lib/rfsv.cc:66
+#: lib/rfsv.cc:70
 msgid "no such directory"
 msgstr "Kein solcher Ordner"
 
-#: lib/rfsv.cc:67
+#: lib/rfsv.cc:71
 msgid "no such record"
 msgstr "Kein solcher Datensatz"
 
-#: lib/rfsv.cc:68
+#: lib/rfsv.cc:72
 msgid "file is read-only"
 msgstr "Datei ist nur lesbar"
 
-#: lib/rfsv.cc:69
+#: lib/rfsv.cc:73
 msgid "invalid I/O operation"
 msgstr "ungültige E/A-Operation"
 
-#: lib/rfsv.cc:70
+#: lib/rfsv.cc:74
 msgid "I/O pending (not yet completed)"
 msgstr "E/A anstehend (noch nicht beendet)"
 
-#: lib/rfsv.cc:71
+#: lib/rfsv.cc:75
 msgid "invalid volume name"
 msgstr "ungültiger Einheitenname"
 
-#: lib/rfsv.cc:72
+#: lib/rfsv.cc:76
 msgid "cancelled"
 msgstr "abgebrochen"
 
-#: lib/rfsv.cc:73
+#: lib/rfsv.cc:77
 msgid "no memory for control block"
 msgstr "kein Speicher für Kontrollblock"
 
-#: lib/rfsv.cc:74
+#: lib/rfsv.cc:78
 msgid "unit disconnected"
 msgstr "Einheit nicht verbunden"
 
-#: lib/rfsv.cc:75
+#: lib/rfsv.cc:79
 msgid "already connected"
 msgstr "bereits verbunden"
 
-#: lib/rfsv.cc:76
+#: lib/rfsv.cc:80
 msgid "retransmission threshold exceeded"
 msgstr "Anzahl der Übertragungsversuche überschritten"
 
-#: lib/rfsv.cc:77
+#: lib/rfsv.cc:81
 msgid "physical link failure"
 msgstr "physikalischer Verbindungsfehler"
 
-#: lib/rfsv.cc:78
+#: lib/rfsv.cc:82
 msgid "inactivity timer expired"
 msgstr "Zeitlimit für Inaktivität abgelaufen"
 
-#: lib/rfsv.cc:79
+#: lib/rfsv.cc:83
 msgid "serial parity error"
 msgstr "Serieller Paritätsfehler"
 
-#: lib/rfsv.cc:80
+#: lib/rfsv.cc:84
 msgid "serial framing error"
 msgstr "Serieller Rahmenfehler"
 
-#: lib/rfsv.cc:81
+#: lib/rfsv.cc:85
 msgid "serial overrun error"
 msgstr "Serieller Ãœberlauf"
 
-#: lib/rfsv.cc:82
+#: lib/rfsv.cc:86
 msgid "modem cannot connect to remote modem"
 msgstr "Modem kann nicht zu entferntem Modem verbinden"
 
-#: lib/rfsv.cc:83
+#: lib/rfsv.cc:87
 msgid "remote modem busy"
 msgstr "Entferntes Modem besetzt"
 
-#: lib/rfsv.cc:84
+#: lib/rfsv.cc:88
 msgid "remote modem did not answer"
 msgstr "Entferntes Modem antwortet nicht"
 
-#: lib/rfsv.cc:85
+#: lib/rfsv.cc:89
 msgid "number blacklisted by the modem"
 msgstr "Rufnummer durch Modem gesperrt"
 
-#: lib/rfsv.cc:86
+#: lib/rfsv.cc:90
 msgid "drive not ready"
 msgstr "Laufwerk nicht bereit"
 
-#: lib/rfsv.cc:87
+#: lib/rfsv.cc:91
 msgid "unknown media"
 msgstr "Unbekanntes Medium"
 
-#: lib/rfsv.cc:88
+#: lib/rfsv.cc:92
 msgid "directory full"
 msgstr "Ordner voll"
 
-#: lib/rfsv.cc:89
+#: lib/rfsv.cc:93
 msgid "write-protected"
 msgstr "Schreibgeschützt"
 
-#: lib/rfsv.cc:90
+#: lib/rfsv.cc:94
 msgid "media corrupt"
 msgstr "Medium beschädigt"
 
-#: lib/rfsv.cc:91
+#: lib/rfsv.cc:95
 msgid "aborted operation"
 msgstr "abgebrochene Operation"
 
-#: lib/rfsv.cc:92
+#: lib/rfsv.cc:96
 msgid "failed to erase flash media"
 msgstr "Löschen des Flash-Mediums gescheitert"
 
-#: lib/rfsv.cc:93
+#: lib/rfsv.cc:97
 msgid "invalid file for DBF system"
 msgstr "Ungültige Datei für DBF-System"
 
-#: lib/rfsv.cc:94
+#: lib/rfsv.cc:98
 msgid "power failure"
 msgstr "Stromversorgung ausgefallen"
 
-#: lib/rfsv.cc:95
+#: lib/rfsv.cc:99
 msgid "too big"
 msgstr "zu groß"
 
-#: lib/rfsv.cc:96
+#: lib/rfsv.cc:100
 msgid "bad descriptor"
 msgstr "fehlerhafter Deskriptor"
 
-#: lib/rfsv.cc:97
+#: lib/rfsv.cc:101
 msgid "bad entry point"
 msgstr "fehlerhafter Einstiegspunkt"
 
-#: lib/rfsv.cc:98
+#: lib/rfsv.cc:102
 msgid "could not diconnect"
 msgstr "Konnte Verbindung nicht beenden"
 
-#: lib/rfsv.cc:99
+#: lib/rfsv.cc:103
 msgid "bad driver"
 msgstr "fehlerhafter Treiber"
 
-#: lib/rfsv.cc:100
+#: lib/rfsv.cc:104
 msgid "operation not completed"
 msgstr "Operation nicht abgeschlossen"
 
-#: lib/rfsv.cc:101
+#: lib/rfsv.cc:105
 msgid "server busy"
 msgstr "Server beschäftigt"
 
-#: lib/rfsv.cc:102
+#: lib/rfsv.cc:106
 msgid "terminated"
 msgstr "beendet"
 
-#: lib/rfsv.cc:103
+#: lib/rfsv.cc:107
 msgid "died"
 msgstr "abgestürzt"
 
-#: lib/rfsv.cc:104
+#: lib/rfsv.cc:108
 msgid "bad handle"
 msgstr "fehlerhafte Referenz"
 
-#: lib/rfsv.cc:105
+#: lib/rfsv.cc:109
 msgid "invalid operation for RFSV16"
 msgstr "Ungültige Operation für RFSV16"
 
-#: lib/rfsv.cc:106
+#: lib/rfsv.cc:110
 msgid "libplp internal error"
 msgstr "Interner libplp Fehler"
 
-#: lib/rpcs.cc:45
+#: lib/rpcs.cc:41
 msgid "Unknown device"
 msgstr "Unbekanntes Gerät"
 
-#: lib/rpcs.cc:46
+#: lib/rpcs.cc:42
 msgid "PC"
 msgstr "PC"
 
-#: lib/rpcs.cc:47
+#: lib/rpcs.cc:43
 msgid "MC"
 msgstr "MC"
 
-#: lib/rpcs.cc:48
+#: lib/rpcs.cc:44
 msgid "HC"
 msgstr "HC"
 
-#: lib/rpcs.cc:49
+#: lib/rpcs.cc:45
 msgid "Series 3"
 msgstr "Serie 3"
 
-#: lib/rpcs.cc:50
+#: lib/rpcs.cc:46
 msgid "Series 3a, 3c or 3mx"
 msgstr "Serie 3a; 3c oder 3mx"
 
-#: lib/rpcs.cc:51
+#: lib/rpcs.cc:47
 msgid "Workabout"
 msgstr "Workabout"
 
-#: lib/rpcs.cc:52
+#: lib/rpcs.cc:48
 msgid "Sienna"
 msgstr "Sienna"
 
-#: lib/rpcs.cc:53
+#: lib/rpcs.cc:49
 msgid "Series 3c"
 msgstr "Serie 3c"
 
-#: lib/rpcs.cc:54
+#: lib/rpcs.cc:50
 msgid "Series 5"
 msgstr "Serie 5"
 
-#: lib/rpcs.cc:55
+#: lib/rpcs.cc:51
 msgid "WinC"
 msgstr "WinC"
 
-#: lib/rpcs.cc:59
+#: lib/rpcs.cc:55
 msgid "Empty"
 msgstr "Leer"
 
-#: lib/rpcs.cc:60
+#: lib/rpcs.cc:56
 msgid "Very Low"
 msgstr "Sehr verbraucht"
 
-#: lib/rpcs.cc:61
+#: lib/rpcs.cc:57
 msgid "Low"
 msgstr "Verbraucht"
 
-#: lib/rpcs.cc:62
+#: lib/rpcs.cc:58
 msgid "Good"
 msgstr "Gut"
 
-#: lib/rpcs.cc:66
+#: lib/rpcs.cc:62
 msgid "Test"
 msgstr "Test"
 
-#: lib/rpcs.cc:67
+#: lib/rpcs.cc:63
 msgid "English"
 msgstr "Englisch"
 
-#: lib/rpcs.cc:68
+#: lib/rpcs.cc:64
 msgid "German"
 msgstr "Deutsch"
 
-#: lib/rpcs.cc:69
+#: lib/rpcs.cc:65
 msgid "French"
 msgstr "Französisch"
 
-#: lib/rpcs.cc:70
+#: lib/rpcs.cc:66
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: lib/rpcs.cc:71
+#: lib/rpcs.cc:67
 msgid "Italian"
 msgstr "Italienisch"
 
-#: lib/rpcs.cc:72
+#: lib/rpcs.cc:68
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: lib/rpcs.cc:73
+#: lib/rpcs.cc:69
 msgid "Danish"
 msgstr "Dänisch"
 
-#: lib/rpcs.cc:74
+#: lib/rpcs.cc:70
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: lib/rpcs.cc:75
+#: lib/rpcs.cc:71
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: lib/rpcs.cc:76
+#: lib/rpcs.cc:72
 msgid "American"
 msgstr "Amerikanisch"
 
-#: lib/rpcs.cc:77
+#: lib/rpcs.cc:73
 msgid "Swiss French"
 msgstr "Schweizer Französisch"
 
-#: lib/rpcs.cc:78
+#: lib/rpcs.cc:74
 msgid "Swiss German"
 msgstr "Schweizer Deutsch"
 
-#: lib/rpcs.cc:79
+#: lib/rpcs.cc:75
 msgid "Portugese"
 msgstr "Portugiesisch"
 
-#: lib/rpcs.cc:80
+#: lib/rpcs.cc:76
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: lib/rpcs.cc:81
+#: lib/rpcs.cc:77
 msgid "Icelandic"
 msgstr "Isländisch"
 
-#: lib/rpcs.cc:82
+#: lib/rpcs.cc:78
 msgid "Russian"
 msgstr "Russisch"
 
-#: lib/rpcs.cc:83
+#: lib/rpcs.cc:79
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: lib/rpcs.cc:84
+#: lib/rpcs.cc:80
 msgid "Dutch"
 msgstr "Holländisch"
 
-#: lib/rpcs.cc:85
+#: lib/rpcs.cc:81
 msgid "Belgian Flemish"
 msgstr "Belgisch Flämisch"
 
-#: lib/rpcs.cc:86
+#: lib/rpcs.cc:82
 msgid "Australian"
 msgstr "Australisch"
 
-#: lib/rpcs.cc:87
+#: lib/rpcs.cc:83
 msgid "Belgish French"
 msgstr "Belgisch Französisch"
 
-#: lib/rpcs.cc:88
+#: lib/rpcs.cc:84
 msgid "Austrian"
 msgstr "Österreichisch"
 
-#: lib/rpcs.cc:89
+#: lib/rpcs.cc:85
 msgid "New Zealand"
 msgstr "Neuseeländisch"
 
 #  FIXME: not shure about ISO code
-#: lib/rpcs.cc:90
+#: lib/rpcs.cc:86
 msgid "International French"
 msgstr "Internationales Französisch"
 
 #  FIXME: not shure about ISO code
-#: lib/rpcs.cc:91
+#: lib/rpcs.cc:87
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: lib/rpcs.cc:92
+#: lib/rpcs.cc:88
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: lib/rpcs.cc:93
+#: lib/rpcs.cc:89
 msgid "Polish"
 msgstr "Polnisch"
 
-#: lib/rpcs.cc:94
+#: lib/rpcs.cc:90
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: lib/psitime.h:73
+#: lib/psitime.h:74
 msgid " years "
 msgstr " Jahre "
 
-#: lib/psitime.h:73
+#: lib/psitime.h:74
 msgid " year "
 msgstr " Jahr "
 
-#: lib/psitime.h:75
+#: lib/psitime.h:76
 msgid " days "
 msgstr " Tage "
 
-#: lib/psitime.h:75
+#: lib/psitime.h:76
 msgid " day "
 msgstr " Tag "
 
-#: lib/psitime.h:77
+#: lib/psitime.h:78
 msgid " hours "
 msgstr " Stunden "
 
-#: lib/psitime.h:77
+#: lib/psitime.h:78
 msgid " hour "
 msgstr " Stunde "
 
-#: lib/psitime.h:79
+#: lib/psitime.h:80
 msgid " minutes "
 msgstr " Minuten "
 
-#: lib/psitime.h:79
+#: lib/psitime.h:80
 msgid " minute "
 msgstr " Minute "
 
-#: lib/psitime.h:80 plpftp/ftp.cc:820 plpftp/ftp.cc:822 plpftp/ftp.cc:905
+#: lib/psitime.h:81 plpftp/ftp.cc:822 plpftp/ftp.cc:824 plpftp/ftp.cc:907
 msgid " seconds"
 msgstr " Sekunden"
 
-#: lib/psitime.h:80
+#: lib/psitime.h:81
 msgid " second"
 msgstr " Sekunde"
 
-#: lib/rpcsfactory.cc:44 lib/rfsvfactory.cc:46
+#: lib/rpcsfactory.cc:39 lib/rfsvfactory.cc:42
 msgid "could not send version request"
 msgstr "Konnte Versions-Anforderung nicht versenden"
 
-#: lib/rpcsfactory.cc:45 lib/rfsvfactory.cc:47
+#: lib/rpcsfactory.cc:40 lib/rfsvfactory.cc:43
 msgid "try again"
 msgstr "Erneut versuchen"
 
-#: lib/rpcsfactory.cc:46 lib/rfsvfactory.cc:48
+#: lib/rpcsfactory.cc:41 lib/rfsvfactory.cc:44
 msgid "no psion connected"
 msgstr "Kein Psion angeschlossen"
 
-#: lib/rpcsfactory.cc:47 lib/rfsvfactory.cc:49
+#: lib/rpcsfactory.cc:42 lib/rfsvfactory.cc:45
 msgid "wrong protocol version"
 msgstr "Falsche Protokoll-Version"
 
-#: lib/rpcsfactory.cc:48 lib/rfsvfactory.cc:50
+#: lib/rpcsfactory.cc:43 lib/rfsvfactory.cc:46
 msgid "no response from ncpd"
 msgstr "Keine Antwort vom ncpd"
 
@@ -552,7 +552,7 @@ msgstr "Keine Antwort vom ncpd"
 msgid "Not present"
 msgstr "Nicht vorhanden"
 
-#: lib/plpdirent.cc:176 ncpd/link.cc:57
+#: lib/plpdirent.cc:176 ncpd/link.cc:59
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -872,7 +872,7 @@ msgstr "Name der Prärequisite für %s ist %.*s\n"
 msgid "%d .. %d (%d bytes): Req record for uid %08x\n"
 msgstr "%d .. %d (%d bytes): Req eintrag für UID %08x\n"
 
-#: plpftp/main.cc:52
+#: plpftp/main.cc:55
 msgid ""
 "Usage: plpftp [OPTIONS]... [FTPCOMMAND]\n"
 "\n"
@@ -902,449 +902,449 @@ msgstr ""
 "                         Vorgabe für HOST ist 127.0.0.1\n"
 "                         Vorgabe für PORT ist "
 
-#: plpftp/main.cc:71
+#: plpftp/main.cc:74
 msgid "Try `plpftp --help' for more information"
 msgstr "Versuchen Sie `plpftp --help' für weitere Informationen."
 
-#: plpftp/main.cc:84
+#: plpftp/main.cc:87
 msgid "PLPFTP Version "
 msgstr "PLPFTP Version "
 
-#: plpftp/main.cc:85
+#: plpftp/main.cc:88
 msgid " Copyright (C) 1999  Philip Proudman"
 msgstr " Copyright (C) 1999  Philip Proudman"
 
-#: plpftp/main.cc:86
+#: plpftp/main.cc:89
 msgid " Additions Copyright (C) 1999-2002 Fritz Elfert <felfert@to.com>"
 msgstr " Erweiterungen Copyright (C) 1999-2002 Fritz Elfert <felfert@to.com>"
 
-#: plpftp/main.cc:87
+#: plpftp/main.cc:90
 msgid "                   & (C) 1999 Matt Gumbley <matt@gumbley.demon.co.uk>"
 msgstr "                   & (C) 1999 Matt Gumbley <matt@gumbley.demon.co.uk>"
 
-#: plpftp/main.cc:88
+#: plpftp/main.cc:91
 msgid "PLPFTP comes with ABSOLUTELY NO WARRANTY."
 msgstr "PLPFTP kommt mit ABSOLUT KEINER GARANTIE"
 
-#: plpftp/main.cc:89
+#: plpftp/main.cc:92
 msgid "This is free software, and you are welcome to redistribute it"
 msgstr "Dies ist freie Software. Sie können Sie unter den Bedingungen"
 
-#: plpftp/main.cc:90
+#: plpftp/main.cc:93
 msgid "under GPL conditions; see the COPYING file in the distribution."
 msgstr "der GPL weitergeben. Siehe die Datei COPYING im Paket."
 
-#: plpftp/main.cc:92
+#: plpftp/main.cc:95
 msgid "FTP like interface started. Type \"?\" for help."
 msgstr "FTP Oberfläche gestartet. Geben Sie \"?\" ein, um Hilfe zu bekommen."
 
-#: plpftp/main.cc:155
+#: plpftp/main.cc:158
 msgid "plpftp Version "
 msgstr "plpftp Version "
 
-#: plpftp/main.cc:170 plpftp/main.cc:175
+#: plpftp/main.cc:173 plpftp/main.cc:178
 msgid "plpftp: could not connect to ncpd"
 msgstr "plpftp: Konnte ncpd nicht kontaktieren."
 
-#: plpftp/ftp.cc:86
+#: plpftp/ftp.cc:88
 msgid "Known FTP commands:"
 msgstr "Bekannte FTP Kommandos:"
 
-#: plpftp/ftp.cc:112
+#: plpftp/ftp.cc:114
 msgid "Known RPC commands:"
 msgstr "Bekannte RPC Kommandos:"
 
-#: plpftp/ftp.cc:230
+#: plpftp/ftp.cc:232
 msgid "Connected to a "
 msgstr "Verbunden mit einem "
 
-#: plpftp/ftp.cc:230
+#: plpftp/ftp.cc:232
 msgid " at "
 msgstr " bei "
 
-#: plpftp/ftp.cc:231
+#: plpftp/ftp.cc:233
 msgid " baud, OwnerInfo:"
 msgstr " baud, Benutzerinfo:"
 
-#: plpftp/ftp.cc:237
+#: plpftp/ftp.cc:239
 msgid "OwnerInfo returned error "
 msgstr "OwnerInfo lieferte Fehler "
 
-#: plpftp/ftp.cc:257
+#: plpftp/ftp.cc:259
 msgid "FATAL: Couldn't find default Drive"
 msgstr "FATAL: Konnte Standard-Laufwerk nicht ermitteln"
 
-#: plpftp/ftp.cc:266
+#: plpftp/ftp.cc:268
 msgid "Psion dir is: \""
 msgstr "Psion Ordner ist: \""
 
-#: plpftp/ftp.cc:281
+#: plpftp/ftp.cc:283
 msgid "Prompting now "
 msgstr "Prompt ist nun "
 
-#: plpftp/ftp.cc:281 plpftp/ftp.cc:286
+#: plpftp/ftp.cc:283 plpftp/ftp.cc:288
 msgid "on"
 msgstr "an"
 
-#: plpftp/ftp.cc:281 plpftp/ftp.cc:286 plpftp/ftp.cc:798 plpftp/ftp.cc:801
-#: plpftp/ftp.cc:804
+#: plpftp/ftp.cc:283 plpftp/ftp.cc:288 plpftp/ftp.cc:800 plpftp/ftp.cc:803
+#: plpftp/ftp.cc:806
 msgid "off"
 msgstr "aus"
 
-#: plpftp/ftp.cc:286
+#: plpftp/ftp.cc:288
 msgid "Hash printing now "
 msgstr "Fortschrittsanzeige ist nun "
 
-#: plpftp/ftp.cc:291
+#: plpftp/ftp.cc:293
 msgid "Local dir: \""
 msgstr "Lokaler Ordner: \""
 
-#: plpftp/ftp.cc:292
+#: plpftp/ftp.cc:294
 msgid "Psion dir: \""
 msgstr "Psion Ordner: \""
 
-#: plpftp/ftp.cc:297 plpftp/ftp.cc:307 plpftp/ftp.cc:316 plpftp/ftp.cc:324
-#: plpftp/ftp.cc:332 plpftp/ftp.cc:342 plpftp/ftp.cc:354 plpftp/ftp.cc:404
-#: plpftp/ftp.cc:410 plpftp/ftp.cc:438 plpftp/ftp.cc:480 plpftp/ftp.cc:537
-#: plpftp/ftp.cc:560 plpftp/ftp.cc:586 plpftp/ftp.cc:623 plpftp/ftp.cc:651
-#: plpftp/ftp.cc:712 plpftp/ftp.cc:732 plpftp/ftp.cc:739 plpftp/ftp.cc:746
-#: plpftp/ftp.cc:786 plpftp/ftp.cc:869 plpftp/ftp.cc:879 plpftp/ftp.cc:942
-#: plpftp/ftp.cc:984 plpftp/ftp.cc:994 plpftp/ftp.cc:1015 plpftp/ftp.cc:1041
-#: plpftp/ftp.cc:1106
+#: plpftp/ftp.cc:299 plpftp/ftp.cc:309 plpftp/ftp.cc:318 plpftp/ftp.cc:326
+#: plpftp/ftp.cc:334 plpftp/ftp.cc:344 plpftp/ftp.cc:356 plpftp/ftp.cc:406
+#: plpftp/ftp.cc:412 plpftp/ftp.cc:440 plpftp/ftp.cc:482 plpftp/ftp.cc:539
+#: plpftp/ftp.cc:562 plpftp/ftp.cc:588 plpftp/ftp.cc:625 plpftp/ftp.cc:653
+#: plpftp/ftp.cc:714 plpftp/ftp.cc:734 plpftp/ftp.cc:741 plpftp/ftp.cc:748
+#: plpftp/ftp.cc:788 plpftp/ftp.cc:871 plpftp/ftp.cc:881 plpftp/ftp.cc:944
+#: plpftp/ftp.cc:986 plpftp/ftp.cc:996 plpftp/ftp.cc:1017 plpftp/ftp.cc:1043
+#: plpftp/ftp.cc:1108
 msgid "Error: "
 msgstr "Fehler: "
 
-#: plpftp/ftp.cc:412
+#: plpftp/ftp.cc:414
 msgid " Entries"
 msgstr " Einträge"
 
-#: plpftp/ftp.cc:418
+#: plpftp/ftp.cc:420
 msgid "Drive Type Volname     Total     Free      UniqueID"
 msgstr "LW    Typ  Vol.Name    Total     Frei      Eind.ID"
 
-#: plpftp/ftp.cc:496
+#: plpftp/ftp.cc:498
 msgid "No such directory"
 msgstr "Kein solcher Ordner"
 
-#: plpftp/ftp.cc:497 plpftp/ftp.cc:538
+#: plpftp/ftp.cc:499 plpftp/ftp.cc:540
 msgid "Keeping original directory \""
 msgstr "Behalte ursprünglichen Ordner \""
 
-#: plpftp/ftp.cc:577 plpftp/ftp.cc:668
+#: plpftp/ftp.cc:579 plpftp/ftp.cc:670
 msgid "Transfer complete, ("
 msgstr "Ãœbertragung abgeschlossen, ("
 
-#: plpftp/ftp.cc:578 plpftp/ftp.cc:669 plpbackup/plpbackup.cc:1202
+#: plpftp/ftp.cc:580 plpftp/ftp.cc:671 plpbackup/plpbackup.cc:1204
 msgid " bytes in "
 msgstr " Bytes in "
 
-#: plpftp/ftp.cc:579 plpftp/ftp.cc:670
+#: plpftp/ftp.cc:581 plpftp/ftp.cc:672
 msgid " secs = "
 msgstr " sek. = "
 
-#: plpftp/ftp.cc:599
+#: plpftp/ftp.cc:601
 msgid "Get \""
 msgstr "Hole \""
 
-#: plpftp/ftp.cc:628 plpftp/ftp.cc:717
+#: plpftp/ftp.cc:630 plpftp/ftp.cc:719
 msgid "Transfer complete\n"
 msgstr "Ãœbertragung abgeschlossen\n"
 
-#: plpftp/ftp.cc:694
+#: plpftp/ftp.cc:696
 msgid "Put \""
 msgstr "Sende \""
 
-#: plpftp/ftp.cc:724
+#: plpftp/ftp.cc:726
 msgid "Error in directory name \""
 msgstr "Fehler in Ordner-Namen \""
 
-#: plpftp/ftp.cc:760
+#: plpftp/ftp.cc:762
 msgid "Starting subshell ...\n"
 msgstr "Starte Sub-Shell ...\n"
 
-#: plpftp/ftp.cc:790
+#: plpftp/ftp.cc:792
 msgid "Unknown setup info received"
 msgstr "Unbekannte Einstellungen empfangen"
 
-#: plpftp/ftp.cc:793
+#: plpftp/ftp.cc:795
 msgid "Setup information:"
 msgstr "Einstellungen:"
 
-#: plpftp/ftp.cc:794
+#: plpftp/ftp.cc:796
 msgid "  Screen contrast:                  "
 msgstr "  Anzeige Kontrast:                        "
 
-#: plpftp/ftp.cc:796
+#: plpftp/ftp.cc:798
 msgid "  Keyboard click:                   "
 msgstr "  Tastatur Klick:                          "
 
-#: plpftp/ftp.cc:798 plpftp/ftp.cc:801 plpftp/ftp.cc:804
+#: plpftp/ftp.cc:800 plpftp/ftp.cc:803 plpftp/ftp.cc:806
 msgid "high"
 msgstr "laut"
 
-#: plpftp/ftp.cc:798 plpftp/ftp.cc:801 plpftp/ftp.cc:804
+#: plpftp/ftp.cc:800 plpftp/ftp.cc:803 plpftp/ftp.cc:806
 msgid "low"
 msgstr "leise"
 
-#: plpftp/ftp.cc:799
+#: plpftp/ftp.cc:801
 msgid "  Screen click:                     "
 msgstr "  Bildschirm Klick:                        "
 
-#: plpftp/ftp.cc:802
+#: plpftp/ftp.cc:804
 msgid "  Error sound:                      "
 msgstr "  Fehlerton:                               "
 
-#: plpftp/ftp.cc:805
+#: plpftp/ftp.cc:807
 msgid "  Auto-switch off:                  "
 msgstr "  Automatisches Ausschalten:               "
 
-#: plpftp/ftp.cc:808 plpftp/ftp.cc:834
+#: plpftp/ftp.cc:810 plpftp/ftp.cc:836
 msgid "never"
 msgstr "nie"
 
-#: plpftp/ftp.cc:811
+#: plpftp/ftp.cc:813
 msgid "if running on battery power"
 msgstr "bei Batteriebetrieb"
 
-#: plpftp/ftp.cc:814 plpftp/ftp.cc:840
+#: plpftp/ftp.cc:816 plpftp/ftp.cc:842
 msgid "always"
 msgstr "immer"
 
-#: plpftp/ftp.cc:819
+#: plpftp/ftp.cc:821
 msgid "  Switch off after:                 "
 msgstr "  Ausschalten nach:                        "
 
-#: plpftp/ftp.cc:821
+#: plpftp/ftp.cc:823
 msgid "  Backlight off after:              "
 msgstr "  Hintergrundbeleuchtung ausschalten nach: "
 
-#: plpftp/ftp.cc:823
+#: plpftp/ftp.cc:825
 msgid "  Switch on when tapping on screen: "
 msgstr "  Einschalten beim Tippen auf die Anzeige: "
 
-#: plpftp/ftp.cc:824 plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830
-#: plpftp/ftp.cc:893 plpftp/ftp.cc:907 plpftp/ftp.cc:925
+#: plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830 plpftp/ftp.cc:832
+#: plpftp/ftp.cc:895 plpftp/ftp.cc:909 plpftp/ftp.cc:927
 msgid "yes"
 msgstr "ja"
 
-#: plpftp/ftp.cc:824 plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830
-#: plpftp/ftp.cc:893 plpftp/ftp.cc:907 plpftp/ftp.cc:925
+#: plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830 plpftp/ftp.cc:832
+#: plpftp/ftp.cc:895 plpftp/ftp.cc:909 plpftp/ftp.cc:927
 msgid "no"
 msgstr "nein"
 
-#: plpftp/ftp.cc:825
+#: plpftp/ftp.cc:827
 msgid "  Switch on when opening:           "
 msgstr "  Einschalten beim Öffnen:                 "
 
-#: plpftp/ftp.cc:827
+#: plpftp/ftp.cc:829
 msgid "  Switch off when closing:          "
 msgstr "  Ausschalten beim Schließen:              "
 
-#: plpftp/ftp.cc:829
+#: plpftp/ftp.cc:831
 msgid "  Ask for password on startup:      "
 msgstr "  Beim Einschalten nach Passwort fragen:   "
 
-#: plpftp/ftp.cc:831
+#: plpftp/ftp.cc:833
 msgid "  Show Owner info on startup:       "
 msgstr "  Beim Einschalten Eigentümer anzeigen:    "
 
-#: plpftp/ftp.cc:837
+#: plpftp/ftp.cc:839
 msgid "once a day"
 msgstr "einmal täglich"
 
-#: plpftp/ftp.cc:883
+#: plpftp/ftp.cc:885
 msgid "General:"
 msgstr "Allgemein:"
 
-#: plpftp/ftp.cc:884
+#: plpftp/ftp.cc:886
 msgid "  Machine Type: "
 msgstr "  Geräte Typ:     "
 
-#: plpftp/ftp.cc:885
+#: plpftp/ftp.cc:887
 msgid "  Machine Name: "
 msgstr "  Modell Name:    "
 
-#: plpftp/ftp.cc:886
+#: plpftp/ftp.cc:888
 msgid "  Machine UID:  "
 msgstr "  Geräte-ID:      "
 
-#: plpftp/ftp.cc:887
+#: plpftp/ftp.cc:889
 msgid "  UI Language:  "
 msgstr "  UI-Sprache:     "
 
-#: plpftp/ftp.cc:888
+#: plpftp/ftp.cc:890
 msgid "ROM:"
 msgstr "ROM:"
 
-#: plpftp/ftp.cc:889
+#: plpftp/ftp.cc:891
 msgid "  Version:      "
 msgstr "  Version:        "
 
-#: plpftp/ftp.cc:891 plpftp/ftp.cc:895
+#: plpftp/ftp.cc:893 plpftp/ftp.cc:897
 msgid "  Size:         "
 msgstr "  Größe:          "
 
-#: plpftp/ftp.cc:892
+#: plpftp/ftp.cc:894
 msgid "  Programmable: "
 msgstr "  Programmierbar: "
 
-#: plpftp/ftp.cc:894
+#: plpftp/ftp.cc:896
 msgid "RAM:"
 msgstr "RAM:"
 
-#: plpftp/ftp.cc:896
+#: plpftp/ftp.cc:898
 msgid "  Free:         "
 msgstr "  Frei:           "
 
-#: plpftp/ftp.cc:897
+#: plpftp/ftp.cc:899
 msgid "  Free max:     "
 msgstr "  Max frei:       "
 
-#: plpftp/ftp.cc:898
+#: plpftp/ftp.cc:900
 msgid "RAM disk size:  "
 msgstr "RAM Disk Größe:   "
 
-#: plpftp/ftp.cc:899
+#: plpftp/ftp.cc:901
 msgid "Registry size:  "
 msgstr "Registry-Größe:   "
 
-#: plpftp/ftp.cc:900
+#: plpftp/ftp.cc:902
 msgid "Display size:   "
 msgstr "Anzeige-Größe:    "
 
-#: plpftp/ftp.cc:902
+#: plpftp/ftp.cc:904
 msgid "Time:"
 msgstr "Zeit:"
 
-#: plpftp/ftp.cc:904
+#: plpftp/ftp.cc:906
 msgid "  Current time: "
 msgstr "  Aktuelle Zeit:  "
 
-#: plpftp/ftp.cc:905
+#: plpftp/ftp.cc:907
 msgid "  UTC offset:   "
 msgstr "  UTC-Abweichung: "
 
-#: plpftp/ftp.cc:906
+#: plpftp/ftp.cc:908
 msgid "  DST:          "
 msgstr "  Sommerzeit:     "
 
-#: plpftp/ftp.cc:908
+#: plpftp/ftp.cc:910
 msgid "  Timezone:     "
 msgstr "  Zeitzone:       "
 
-#: plpftp/ftp.cc:909
+#: plpftp/ftp.cc:911
 msgid "  Country Code: "
 msgstr "  Länder-Code:    "
 
-#: plpftp/ftp.cc:910
+#: plpftp/ftp.cc:912
 msgid "Main battery:"
 msgstr "Hauptbatterie:"
 
-#: plpftp/ftp.cc:912
+#: plpftp/ftp.cc:914
 msgid "  Changed at:   "
 msgstr "  Gewechselt am:  "
 
-#: plpftp/ftp.cc:913 plpftp/ftp.cc:926
+#: plpftp/ftp.cc:915 plpftp/ftp.cc:928
 msgid "  Used for:     "
 msgstr "  Benutzt:        "
 
-#: plpftp/ftp.cc:914 plpftp/ftp.cc:920
+#: plpftp/ftp.cc:916 plpftp/ftp.cc:922
 msgid "  Status:       "
 msgstr "  Status:         "
 
-#: plpftp/ftp.cc:915
+#: plpftp/ftp.cc:917
 msgid "  Current:      "
 msgstr "  Strom:          "
 
-#: plpftp/ftp.cc:916
+#: plpftp/ftp.cc:918
 msgid "  UsedPower:    "
 msgstr "  Verbrauch:      "
 
-#: plpftp/ftp.cc:917 plpftp/ftp.cc:921
+#: plpftp/ftp.cc:919 plpftp/ftp.cc:923
 msgid "  Voltage:      "
 msgstr "  Spannung:       "
 
-#: plpftp/ftp.cc:918 plpftp/ftp.cc:922
+#: plpftp/ftp.cc:920 plpftp/ftp.cc:924
 msgid "  Max. voltage: "
 msgstr "  Max. Spannung:  "
 
-#: plpftp/ftp.cc:919
+#: plpftp/ftp.cc:921
 msgid "Backup battery:"
 msgstr "Sicherungs-Batterie:"
 
-#: plpftp/ftp.cc:923
+#: plpftp/ftp.cc:925
 msgid "External power:"
 msgstr "Externe Stromversorgung:"
 
-#: plpftp/ftp.cc:924
+#: plpftp/ftp.cc:926
 msgid "  Supplied:     "
 msgstr "  Angeschlossen:  "
 
-#: plpftp/ftp.cc:935
+#: plpftp/ftp.cc:937
 msgid "Could not read processlist "
 msgstr "Konnte Prozessliste nicht lesen "
 
-#: plpftp/ftp.cc:943
+#: plpftp/ftp.cc:945
 msgid " is not a process list saved with killsave"
 msgstr " ist keine mit killsave gespeicherte Prozessliste"
 
-#: plpftp/ftp.cc:983
+#: plpftp/ftp.cc:985
 msgid "Could not start "
 msgstr "Konnte nicht starten: "
 
-#: plpftp/ftp.cc:998
+#: plpftp/ftp.cc:1000
 msgid "Could not write processlist "
 msgstr "Konnte Prozessliste nicht schreiben "
 
-#: plpftp/ftp.cc:1034
+#: plpftp/ftp.cc:1036
 msgid "no such process"
 msgstr "Kein solcher Prozess"
 
-#: plpftp/ftp.cc:1050
+#: plpftp/ftp.cc:1052
 msgid "syntax error. Try \"help\""
 msgstr "Syntaxfehler. Probieren Sie \"help\""
 
-#: plpbackup/plpbackup.cc:100
+#: plpbackup/plpbackup.cc:102
 msgid "Could not get user's home directory from /etc/passwd"
 msgstr "Konnte das persönliche Verzeichnis nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:120
+#: plpbackup/plpbackup.cc:122
 msgid "Could not get machine UID"
 msgstr "Konnte Geräte-UID nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:140
+#: plpbackup/plpbackup.cc:142
 msgid "Could not read SIBO UID file"
 msgstr "Konnte SIBO UID Datei nicht lesen"
 
-#: plpbackup/plpbackup.cc:145
+#: plpbackup/plpbackup.cc:147
 msgid "Could not get Psion owner info"
 msgstr "Konnte Geräte-Eigner nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:172
+#: plpbackup/plpbackup.cc:174
 msgid "Could not write SIBO UID file "
 msgstr "Konnte SIBO UID Datei nicht schreiben "
 
-#: plpbackup/plpbackup.cc:202
+#: plpbackup/plpbackup.cc:204
 msgid "Got signal "
 msgstr "Empfang von Signal "
 
-#: plpbackup/plpbackup.cc:214
+#: plpbackup/plpbackup.cc:216
 msgid "Abort? (y/N) "
 msgstr "Abbruch? (j/N) "
 
-#: plpbackup/plpbackup.cc:215
+#: plpbackup/plpbackup.cc:217
 msgid "Y"
 msgstr "J"
 
-#: plpbackup/plpbackup.cc:231
+#: plpbackup/plpbackup.cc:233
 msgid "Stopping programs ..."
 msgstr "Stoppe Programme ..."
 
-#: plpbackup/plpbackup.cc:233
+#: plpbackup/plpbackup.cc:235
 msgid "plpbackup: Could not get process list: "
 msgstr "plpbackup: Konnte Prozessliste nicht lesen "
 
-#: plpbackup/plpbackup.cc:253
+#: plpbackup/plpbackup.cc:255
 msgid ""
 "Could not stop all processes. Please stop running\n"
 "programs manually on the Psion, then hit return."
@@ -1352,240 +1352,240 @@ msgstr ""
 "Konnte nicht alle Prozesse stoppen. Bitte beenden Sie\n"
 "laufende Programme manuell auf dem Psion. Drücken Sie dann RETURN."
 
-#: plpbackup/plpbackup.cc:268
+#: plpbackup/plpbackup.cc:270
 msgid "Restarting programs ..."
 msgstr "Starte Programme ..."
 
-#: plpbackup/plpbackup.cc:487
+#: plpbackup/plpbackup.cc:489
 msgid "Performing "
 msgstr "Ausführen von "
 
-#: plpbackup/plpbackup.cc:489
+#: plpbackup/plpbackup.cc:491
 msgid "format"
 msgstr "Formatierung"
 
-#: plpbackup/plpbackup.cc:492 plpbackup/plpbackup.cc:507
-#: plpbackup/plpbackup.cc:722
+#: plpbackup/plpbackup.cc:494 plpbackup/plpbackup.cc:509
+#: plpbackup/plpbackup.cc:724
 msgid " and "
 msgstr " und "
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 msgid "restore"
 msgstr "Rücksicherung"
 
-#: plpbackup/plpbackup.cc:495
+#: plpbackup/plpbackup.cc:497
 msgid "full"
 msgstr "kompletter"
 
-#: plpbackup/plpbackup.cc:495
+#: plpbackup/plpbackup.cc:497
 msgid "incremental"
 msgstr "inkrementeller"
 
-#: plpbackup/plpbackup.cc:495
+#: plpbackup/plpbackup.cc:497
 msgid " backup"
 msgstr " Sicherung"
 
-#: plpbackup/plpbackup.cc:496
+#: plpbackup/plpbackup.cc:498
 msgid " of "
 msgstr " von "
 
-#: plpbackup/plpbackup.cc:498
+#: plpbackup/plpbackup.cc:500
 msgid "all drives"
 msgstr "allen Laufverken"
 
-#: plpbackup/plpbackup.cc:500
+#: plpbackup/plpbackup.cc:502
 msgid "Drive "
 msgstr "Laufwerk "
 
-#: plpbackup/plpbackup.cc:513
+#: plpbackup/plpbackup.cc:515
 msgid " to "
 msgstr " nach "
 
-#: plpbackup/plpbackup.cc:515
+#: plpbackup/plpbackup.cc:517
 msgid " from "
 msgstr " von "
 
-#: plpbackup/plpbackup.cc:715
+#: plpbackup/plpbackup.cc:717
 msgid "It contains Backups of drive "
 msgstr "Es enthält Sicherungen von Laufwerk "
 
-#: plpbackup/plpbackup.cc:735
+#: plpbackup/plpbackup.cc:737
 msgid ""
 "Select (I)ndividual files, (W)hole archive, (N)one from this archive? (I/W/"
 "N) "
 msgstr "Wähle (I)ndividuelle Dateien, (G)esamtes Archiv, (N)ichts? (I/G/N) "
 
-#: plpbackup/plpbackup.cc:737
+#: plpbackup/plpbackup.cc:739
 msgid "IWA"
 msgstr "IGN"
 
-#: plpbackup/plpbackup.cc:761
+#: plpbackup/plpbackup.cc:763
 msgid "Could not run external editor"
 msgstr "Konnte externen Editor nicht starten"
 
-#: plpbackup/plpbackup.cc:794
+#: plpbackup/plpbackup.cc:796
 msgid ""
 "Archive skipped, because it does not contain any files on selected drives"
 msgstr ""
 "Archiv übersprungen, da es keine Dateien von den gewählten Lauferken enthält"
 
-#: plpbackup/plpbackup.cc:838
+#: plpbackup/plpbackup.cc:840
 msgid "(O)verwrite, overwrite (A)ll, (S)kip? (O/A/S) "
 msgstr "(Ü)berschreiben, (A)lle überschreiben, Über(s)pringen? (Ü/A/S) "
 
-#: plpbackup/plpbackup.cc:839
+#: plpbackup/plpbackup.cc:841
 msgid "OAS"
 msgstr "ÃœAS"
 
-#: plpbackup/plpbackup.cc:880
+#: plpbackup/plpbackup.cc:882
 msgid "Could not get backup index"
 msgstr "Konnte Sicherungs-Index nicht einlesen"
 
-#: plpbackup/plpbackup.cc:888
+#: plpbackup/plpbackup.cc:890
 msgid "' is a full backup"
 msgstr " ist eine Komplett-Sicherung"
 
-#: plpbackup/plpbackup.cc:892
+#: plpbackup/plpbackup.cc:894
 msgid "' is an incremental backup"
 msgstr " ist eine inkrementelle Sicherung"
 
-#: plpbackup/plpbackup.cc:897
+#: plpbackup/plpbackup.cc:899
 msgid "' is NOT a plpbackup"
 msgstr " ist KEINE mit plpbackup erzeugte Sicherung"
 
-#: plpbackup/plpbackup.cc:934
+#: plpbackup/plpbackup.cc:936
 msgid "Extracting tar archive ..."
 msgstr "Entpacke tar-Archiv ..."
 
-#: plpbackup/plpbackup.cc:936
+#: plpbackup/plpbackup.cc:938
 msgid "Execution of "
 msgstr "Ausführen von "
 
-#: plpbackup/plpbackup.cc:936
+#: plpbackup/plpbackup.cc:938
 msgid " failed."
 msgstr " gescheitert."
 
-#: plpbackup/plpbackup.cc:945 plpbackup/plpbackup.cc:1032
-#: plpbackup/plpbackup.cc:1080
+#: plpbackup/plpbackup.cc:947 plpbackup/plpbackup.cc:1034
+#: plpbackup/plpbackup.cc:1082
 msgid "Restore aborted by user"
 msgstr "Rücksicherung durch Benutzer abgebrochen"
 
-#: plpbackup/plpbackup.cc:953 plpbackup/plpbackup.cc:1072
+#: plpbackup/plpbackup.cc:955 plpbackup/plpbackup.cc:1074
 msgid "Restore "
 msgstr "Rücksichern "
 
-#: plpbackup/plpbackup.cc:966
+#: plpbackup/plpbackup.cc:968
 msgid "Could not create directory "
 msgstr "Fehler beim Anlegen von Verzeichnis "
 
-#: plpbackup/plpbackup.cc:982
+#: plpbackup/plpbackup.cc:984
 msgid "Could not create "
 msgstr "Konnte nicht anlegen "
 
-#: plpbackup/plpbackup.cc:992
+#: plpbackup/plpbackup.cc:994
 msgid "Could not get attributes of "
 msgstr "Fehler beim Lesen der Dateiattribute von "
 
-#: plpbackup/plpbackup.cc:1009
+#: plpbackup/plpbackup.cc:1011
 msgid "Could not set attributes of"
 msgstr "Fehler beim Setzen der Dateiattribute von"
 
-#: plpbackup/plpbackup.cc:1021
+#: plpbackup/plpbackup.cc:1023
 msgid "Could not set modification time of "
 msgstr "Fehler beim Setzen der Änderungszeit von "
 
-#: plpbackup/plpbackup.cc:1044 plpbackup/plpbackup.cc:1246
+#: plpbackup/plpbackup.cc:1046 plpbackup/plpbackup.cc:1248
 msgid "Skipping "
 msgstr "Ãœberspringe "
 
-#: plpbackup/plpbackup.cc:1047 plpbackup/plpbackup.cc:1087
+#: plpbackup/plpbackup.cc:1049 plpbackup/plpbackup.cc:1089
 msgid "Error during restore of "
 msgstr "Fehler beim Rücksichern von "
 
 # This are the characters for valid answers
 # of the next message.
-#: plpbackup/plpbackup.cc:1053 plpbackup/plpbackup.cc:1255
+#: plpbackup/plpbackup.cc:1055 plpbackup/plpbackup.cc:1257
 msgid "STAR"
 msgstr "SDAW"
 
-#: plpbackup/plpbackup.cc:1055 plpbackup/plpbackup.cc:1257
+#: plpbackup/plpbackup.cc:1057 plpbackup/plpbackup.cc:1259
 msgid "(S)kip all, Skip (t)his, (A)bort, (R)etry: "
 msgstr "Ãœber(S)pringe alle, Ãœberspringe (D)iese, (A)bbruch, (W)iederholen: "
 
-#: plpbackup/plpbackup.cc:1106 plpbackup/plpbackup.cc:1394
+#: plpbackup/plpbackup.cc:1108 plpbackup/plpbackup.cc:1396
 msgid "Total time elapsed:     "
 msgstr "Gesamtzeit:     "
 
-#: plpbackup/plpbackup.cc:1140 plpbackup/plpbackup.cc:1192
-#: plpbackup/plpbackup.cc:1234 plpbackup/plpbackup.cc:1283
+#: plpbackup/plpbackup.cc:1142 plpbackup/plpbackup.cc:1194
+#: plpbackup/plpbackup.cc:1236 plpbackup/plpbackup.cc:1285
 msgid "Backup aborted by user"
 msgstr "Sicherung wegen Fehler abgebrochen"
 
-#: plpbackup/plpbackup.cc:1159 plpbackup/plpbackup.cc:1177
+#: plpbackup/plpbackup.cc:1161 plpbackup/plpbackup.cc:1179
 msgid "Scanning Drive "
 msgstr "Durchsuche Laufwerk "
 
-#: plpbackup/plpbackup.cc:1172
+#: plpbackup/plpbackup.cc:1174
 msgid "plpbackup: Couldn't get Drive list"
 msgstr "plpbackup: Konnte Laufwerks-Liste nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:1202
+#: plpbackup/plpbackup.cc:1204
 msgid "Size of backup: "
 msgstr "Umfang der Sicherung: "
 
-#: plpbackup/plpbackup.cc:1203
+#: plpbackup/plpbackup.cc:1205
 msgid " files."
 msgstr " Dateien."
 
-#: plpbackup/plpbackup.cc:1206
+#: plpbackup/plpbackup.cc:1208
 msgid "Nothing to backup"
 msgstr "Nichts zu sichern"
 
-#: plpbackup/plpbackup.cc:1222 plpbackup/plpbackup.cc:1275
+#: plpbackup/plpbackup.cc:1224 plpbackup/plpbackup.cc:1277
 msgid "Backing up "
 msgstr "Sichere "
 
-#: plpbackup/plpbackup.cc:1249 plpbackup/plpbackup.cc:1290
+#: plpbackup/plpbackup.cc:1251 plpbackup/plpbackup.cc:1292
 msgid "Error during backup of "
 msgstr "Fehler beim Sichern von "
 
-#: plpbackup/plpbackup.cc:1309
+#: plpbackup/plpbackup.cc:1311
 msgid "Writing index ..."
 msgstr "Schreibe Index ..."
 
-#: plpbackup/plpbackup.cc:1336
+#: plpbackup/plpbackup.cc:1338
 msgid "plpbackup: Could not write index "
 msgstr "plpbackup: Konnte Index nicht schreiben "
 
-#: plpbackup/plpbackup.cc:1346
+#: plpbackup/plpbackup.cc:1348
 msgid "Creating tar archive ..."
 msgstr "Lege tar-Archiv an ..."
 
-#: plpbackup/plpbackup.cc:1359
+#: plpbackup/plpbackup.cc:1361
 msgid "plpbackup: Error during execution of "
 msgstr "plpbackup: Fehler beim Ausführen von "
 
-#: plpbackup/plpbackup.cc:1369
+#: plpbackup/plpbackup.cc:1371
 msgid "Resetting archive attributes ..."
 msgstr "Archiv-Attribute zurücksetzen ..."
 
-#: plpbackup/plpbackup.cc:1388
+#: plpbackup/plpbackup.cc:1390
 msgid "Backup aborted due to error"
 msgstr "Sicherung wegen Fehler abgebrochen"
 
-#: plpbackup/plpbackup.cc:1396
+#: plpbackup/plpbackup.cc:1398
 msgid "Time for scanning:      "
 msgstr "Zeit für Durchsuchen:     "
 
-#: plpbackup/plpbackup.cc:1399
+#: plpbackup/plpbackup.cc:1401
 msgid "Time for transfer:      "
 msgstr "Zeit für Übertragung:     "
 
-#: plpbackup/plpbackup.cc:1401
+#: plpbackup/plpbackup.cc:1403
 msgid "Average transfer speed: "
 msgstr "Durchschnittliche Ãœbertragungsgeschwindigkeit: "
 
-#: plpbackup/plpbackup.cc:1412
+#: plpbackup/plpbackup.cc:1414
 msgid ""
 "Usage: plpbackup OPTIONS [<drive>:] [<drive>:] ...\n"
 "\n"
@@ -1622,33 +1622,33 @@ msgstr ""
 "Laufwerke.\n"
 "\n"
 
-#: plpbackup/plpbackup.cc:1429
+#: plpbackup/plpbackup.cc:1431
 msgid "Try 'plpbackup --help' for more information."
 msgstr "Versuchen Sie 'plpbackup --help' für weitere Informationen."
 
-#: plpbackup/plpbackup.cc:1500
+#: plpbackup/plpbackup.cc:1502
 msgid "plpbackup version "
 msgstr "plpbackup Version "
 
-#: plpbackup/plpbackup.cc:1538
+#: plpbackup/plpbackup.cc:1540
 msgid "Invalid drive argument "
 msgstr "Ungültiges Laufwerk "
 
-#: plpbackup/plpbackup.cc:1544
+#: plpbackup/plpbackup.cc:1546
 msgid "Backup mode can not be combined with format or restore."
 msgstr ""
 "Sicherungs-Modus kann nicht mit Formatieren oder Rücksicherung kombiniert "
 "werden."
 
-#: plpbackup/plpbackup.cc:1549
+#: plpbackup/plpbackup.cc:1551
 msgid "Format mode needs at least one drive specified."
 msgstr "Formatier-Modus benötigt mindestens eine Laufwerksangabe."
 
-#: plpbackup/plpbackup.cc:1553
+#: plpbackup/plpbackup.cc:1555
 msgid "Backup can only create one archive at a time."
 msgstr "Die Sicherung kann nur jeweils ein Archiv zu einer Zeit anlegen."
 
-#: plpbackup/plpbackup.cc:1562 plpbackup/plpbackup.cc:1567
+#: plpbackup/plpbackup.cc:1564 plpbackup/plpbackup.cc:1569
 msgid "plpbackup: could not connect to ncpd"
 msgstr "plpbackup: Konnte ncpd nicht kontaktieren"
 
@@ -1717,15 +1717,15 @@ msgstr "Konnte SIS-Datei nicht parsen.\n"
 msgid "Installation complete. Press any key to exit."
 msgstr "Installation beendet. Beenden mit beliebiger Taste."
 
-#: ncpd/main.cc:79
+#: ncpd/main.cc:81
 msgid "Got SIGTERM"
 msgstr "TERM signal erhalten"
 
-#: ncpd/main.cc:87
+#: ncpd/main.cc:89
 msgid "Got SIGINT"
 msgstr "INT Signal erhalten"
 
-#: ncpd/main.cc:147
+#: ncpd/main.cc:149
 msgid ""
 "Usage: ncpd [OPTIONS]...\n"
 "\n"
@@ -1771,17 +1771,17 @@ msgstr ""
 " -s, --serial=DEV        Benutze serielle Schnittstelle DEV.\n"
 " -b, --baudrate=RATE     Setze Schnittstellengeschwindigkeit auf BAUD.\n"
 
-#: ncpd/main.cc:172
+#: ncpd/main.cc:174
 msgid "                         Default: "
 msgstr "                         Vorgabe: "
 
-#: ncpd/main.cc:174
+#: ncpd/main.cc:176
 msgid ""
 "                         Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n"
 msgstr ""
 "                         Vorgabe: Automatisch 115.2k, 57.6k 38.4k, 19.2k\n"
 
-#: ncpd/main.cc:177
+#: ncpd/main.cc:179
 msgid ""
 " -p, --port=[HOST:]PORT  Listen on host HOST, port PORT.\n"
 "                         Default for HOST: 127.0.0.1\n"
@@ -1791,35 +1791,35 @@ msgstr ""
 "                         Vorgabe für HOST: 127.0.0.1\n"
 "                         Vorgabe für PORT: "
 
-#: ncpd/main.cc:185
+#: ncpd/main.cc:187
 msgid "Try `ncpd --help' for more information"
 msgstr "Versuchen Sie `ncpd --help' für weitere Informationen."
 
-#: ncpd/main.cc:277
+#: ncpd/main.cc:279
 msgid "ncpd Version "
 msgstr "ncpd Version "
 
-#: ncpd/main.cc:358
+#: ncpd/main.cc:360
 msgid "daemon started. Listening at "
 msgstr "Daemon gestartet. Lausche auf "
 
-#: ncpd/main.cc:359
+#: ncpd/main.cc:361
 msgid " using device "
 msgstr " unter Verwendung von Gerät "
 
-#: ncpd/main.cc:391
+#: ncpd/main.cc:393
 msgid "terminating"
 msgstr "am Beenden"
 
-#: ncpd/link.cc:58
+#: ncpd/link.cc:60
 msgid "SIBO"
 msgstr "SIBO"
 
-#: ncpd/link.cc:59
+#: ncpd/link.cc:61
 msgid "EPOC"
 msgstr "EPOC"
 
-#: plpnfsd/main.cc:477
+#: plpnfsd/main.cc:479
 msgid ""
 "Usage: plpnfsd [OPTIONS]...\n"
 "\n"
@@ -1849,14 +1849,14 @@ msgstr ""
 "                         Vorgabe für HOST ist 127.0.0.1\n"
 "                         Vorgabe für PORT ist "
 
-#: plpnfsd/main.cc:495
+#: plpnfsd/main.cc:497
 msgid "Try `plpnfsd --help' for more information"
 msgstr "Versuchen Sie `plpnfsd --help' für weitere Informationen."
 
-#: plpnfsd/main.cc:562
+#: plpnfsd/main.cc:564
 msgid "plpnfsd Version "
 msgstr "ncpd Version "
 
-#: plpprint/plpprintd.cc:1023
+#: plpprint/plpprintd.cc:1024
 msgid "plpprintd: could not connect to ncpd"
 msgstr "plpprintd: Konnte ncpd nicht kontaktieren."
diff --git a/po/sv.po b/po/sv.po
index ae88c15..c89f306 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plptools 0.11\n"
-"POT-Creation-Date: 2003-02-01 00:01+0100\n"
+"POT-Creation-Date: 2003-02-05 07:33+0100\n"
 "PO-Revision-Date: 2002-07-11 09:10+0200\n"
 "Last-Translator: Daniel Brahneborg <basic@chello.se>\n"
 "Language-Team: SWEDISH <SE@li.org>\n"
@@ -13,537 +13,537 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/rfsv.cc:33 lib/rpcsfactory.cc:43 lib/rfsvfactory.cc:45
+#: lib/rfsv.cc:37 lib/rpcsfactory.cc:38 lib/rfsvfactory.cc:41
 msgid "no error"
 msgstr "inget fel"
 
-#: lib/rfsv.cc:34
+#: lib/rfsv.cc:38
 msgid "general"
 msgstr "allmän(t)"
 
-#: lib/rfsv.cc:35
+#: lib/rfsv.cc:39
 msgid "bad argument"
 msgstr "felaktig parameter"
 
-#: lib/rfsv.cc:36
+#: lib/rfsv.cc:40
 msgid "OS error"
 msgstr "OS fel"
 
-#: lib/rfsv.cc:37
+#: lib/rfsv.cc:41
 msgid "not supported"
 msgstr "stöds ej"
 
-#: lib/rfsv.cc:38
+#: lib/rfsv.cc:42
 msgid "numeric underflow"
 msgstr "för litet tal"
 
-#: lib/rfsv.cc:39
+#: lib/rfsv.cc:43
 msgid "numeric overflow"
 msgstr "för stort tal"
 
-#: lib/rfsv.cc:40
+#: lib/rfsv.cc:44
 msgid "numeric exception"
 msgstr "numeriskt fel"
 
-#: lib/rfsv.cc:41
+#: lib/rfsv.cc:45
 msgid "in use"
 msgstr "används"
 
-#: lib/rfsv.cc:42
+#: lib/rfsv.cc:46
 msgid "out of memory"
 msgstr "minnet slut"
 
-#: lib/rfsv.cc:43
+#: lib/rfsv.cc:47
 msgid "out of segments"
 msgstr "slut på segment"
 
-#: lib/rfsv.cc:44
+#: lib/rfsv.cc:48
 msgid "out of semaphores"
 msgstr "slut på semaforer"
 
-#: lib/rfsv.cc:45
+#: lib/rfsv.cc:49
 msgid "out of processes"
 msgstr "slut på processer"
 
-#: lib/rfsv.cc:46
+#: lib/rfsv.cc:50
 msgid "already open"
 msgstr "redan öppen"
 
-#: lib/rfsv.cc:47
+#: lib/rfsv.cc:51
 msgid "not open"
 msgstr "inte öppen"
 
-#: lib/rfsv.cc:48
+#: lib/rfsv.cc:52
 msgid "bad image"
 msgstr "trasig fil"
 
-#: lib/rfsv.cc:49
+#: lib/rfsv.cc:53
 msgid "receiver error"
 msgstr "fel hos mottagaren"
 
-#: lib/rfsv.cc:50
+#: lib/rfsv.cc:54
 msgid "device error"
 msgstr "hårdvarufel"
 
-#: lib/rfsv.cc:51
+#: lib/rfsv.cc:55
 msgid "no filesystem"
 msgstr "inget filsystem"
 
-#: lib/rfsv.cc:52
+#: lib/rfsv.cc:56
 msgid "not ready"
 msgstr "inte klar"
 
-#: lib/rfsv.cc:53
+#: lib/rfsv.cc:57
 msgid "no font"
 msgstr "inget typsnitt"
 
-#: lib/rfsv.cc:54
+#: lib/rfsv.cc:58
 msgid "too wide"
 msgstr "för bred"
 
-#: lib/rfsv.cc:55
+#: lib/rfsv.cc:59
 msgid "too many"
 msgstr "för många"
 
-#: lib/rfsv.cc:56
+#: lib/rfsv.cc:60
 msgid "file already exists"
 msgstr "filen finns redan"
 
-#: lib/rfsv.cc:57
+#: lib/rfsv.cc:61
 msgid "no such file"
 msgstr "filen finns ej"
 
-#: lib/rfsv.cc:58
+#: lib/rfsv.cc:62
 msgid "write error"
 msgstr "skrivfel"
 
-#: lib/rfsv.cc:59
+#: lib/rfsv.cc:63
 msgid "read error"
 msgstr "läsfel"
 
-#: lib/rfsv.cc:60
+#: lib/rfsv.cc:64
 msgid "end of file"
 msgstr "filen slut"
 
-#: lib/rfsv.cc:61
+#: lib/rfsv.cc:65
 msgid "disk/serial read buffer full"
 msgstr "läsbuffer full"
 
-#: lib/rfsv.cc:62
+#: lib/rfsv.cc:66
 msgid "invalid name"
 msgstr "ogiltigt namn"
 
-#: lib/rfsv.cc:63
+#: lib/rfsv.cc:67
 msgid "access denied"
 msgstr "inget tillstånd"
 
-#: lib/rfsv.cc:64
+#: lib/rfsv.cc:68
 msgid "resource locked"
 msgstr "resursen låst"
 
-#: lib/rfsv.cc:65
+#: lib/rfsv.cc:69
 msgid "no such device"
 msgstr "enheten finns inte"
 
-#: lib/rfsv.cc:66
+#: lib/rfsv.cc:70
 msgid "no such directory"
 msgstr "mappen finns inte"
 
-#: lib/rfsv.cc:67
+#: lib/rfsv.cc:71
 msgid "no such record"
 msgstr "posten finns inte"
 
-#: lib/rfsv.cc:68
+#: lib/rfsv.cc:72
 msgid "file is read-only"
 msgstr "filen är skrivskyddad"
 
-#: lib/rfsv.cc:69
+#: lib/rfsv.cc:73
 msgid "invalid I/O operation"
 msgstr "ogiltig I/O-operation"
 
-#: lib/rfsv.cc:70
+#: lib/rfsv.cc:74
 msgid "I/O pending (not yet completed)"
 msgstr "I/O pågår"
 
-#: lib/rfsv.cc:71
+#: lib/rfsv.cc:75
 msgid "invalid volume name"
 msgstr "ogiltigt volymnamn"
 
-#: lib/rfsv.cc:72
+#: lib/rfsv.cc:76
 msgid "cancelled"
 msgstr "avbruten"
 
-#: lib/rfsv.cc:73
+#: lib/rfsv.cc:77
 msgid "no memory for control block"
 msgstr "inget minne till kontrollblocket"
 
-#: lib/rfsv.cc:74
+#: lib/rfsv.cc:78
 msgid "unit disconnected"
 msgstr "enheten urkopplad"
 
-#: lib/rfsv.cc:75
+#: lib/rfsv.cc:79
 msgid "already connected"
 msgstr "redan ikopplad"
 
-#: lib/rfsv.cc:76
+#: lib/rfsv.cc:80
 msgid "retransmission threshold exceeded"
 msgstr "överföringsgräns nådd"
 
-#: lib/rfsv.cc:77
+#: lib/rfsv.cc:81
 msgid "physical link failure"
 msgstr "fysiskt fel på länken"
 
-#: lib/rfsv.cc:78
+#: lib/rfsv.cc:82
 msgid "inactivity timer expired"
 msgstr "för lång inaktivitet"
 
-#: lib/rfsv.cc:79
+#: lib/rfsv.cc:83
 msgid "serial parity error"
 msgstr "paritetsfel"
 
-#: lib/rfsv.cc:80
+#: lib/rfsv.cc:84
 msgid "serial framing error"
 msgstr "seriellt ramfel"
 
-#: lib/rfsv.cc:81
+#: lib/rfsv.cc:85
 msgid "serial overrun error"
 msgstr "överfullt på serieporten"
 
-#: lib/rfsv.cc:82
+#: lib/rfsv.cc:86
 msgid "modem cannot connect to remote modem"
 msgstr "modemet kunde inte få kontakt med det uppringda modemet"
 
-#: lib/rfsv.cc:83
+#: lib/rfsv.cc:87
 msgid "remote modem busy"
 msgstr "det uppringa modemet är upptaget"
 
-#: lib/rfsv.cc:84
+#: lib/rfsv.cc:88
 msgid "remote modem did not answer"
 msgstr "det uppringa modemet svarade inte"
 
-#: lib/rfsv.cc:85
+#: lib/rfsv.cc:89
 msgid "number blacklisted by the modem"
 msgstr "numret svartlistat av modemet"
 
-#: lib/rfsv.cc:86
+#: lib/rfsv.cc:90
 msgid "drive not ready"
 msgstr "enheten är inte klar"
 
-#: lib/rfsv.cc:87
+#: lib/rfsv.cc:91
 msgid "unknown media"
 msgstr "okänt media"
 
-#: lib/rfsv.cc:88
+#: lib/rfsv.cc:92
 msgid "directory full"
 msgstr "mappen är full"
 
-#: lib/rfsv.cc:89
+#: lib/rfsv.cc:93
 msgid "write-protected"
 msgstr "skrivskyddad"
 
-#: lib/rfsv.cc:90
+#: lib/rfsv.cc:94
 msgid "media corrupt"
 msgstr "media är trasigt"
 
-#: lib/rfsv.cc:91
+#: lib/rfsv.cc:95
 msgid "aborted operation"
 msgstr "avbruten operation"
 
-#: lib/rfsv.cc:92
+#: lib/rfsv.cc:96
 msgid "failed to erase flash media"
 msgstr "kunde inte radera flashkortet"
 
-#: lib/rfsv.cc:93
+#: lib/rfsv.cc:97
 msgid "invalid file for DBF system"
 msgstr "ogiltig fil för DBF-systemet"
 
-#: lib/rfsv.cc:94
+#: lib/rfsv.cc:98
 msgid "power failure"
 msgstr "spänningsfel"
 
-#: lib/rfsv.cc:95
+#: lib/rfsv.cc:99
 msgid "too big"
 msgstr "för stor"
 
-#: lib/rfsv.cc:96
+#: lib/rfsv.cc:100
 msgid "bad descriptor"
 msgstr "ogiltigt handtag"
 
-#: lib/rfsv.cc:97
+#: lib/rfsv.cc:101
 msgid "bad entry point"
 msgstr "ogiltig ingångspunkt"
 
-#: lib/rfsv.cc:98
+#: lib/rfsv.cc:102
 msgid "could not diconnect"
 msgstr "kunde inte koppla ifrån"
 
-#: lib/rfsv.cc:99
+#: lib/rfsv.cc:103
 msgid "bad driver"
 msgstr "fel drivrutin"
 
-#: lib/rfsv.cc:100
+#: lib/rfsv.cc:104
 msgid "operation not completed"
 msgstr "funktionen ej avslutad"
 
-#: lib/rfsv.cc:101
+#: lib/rfsv.cc:105
 msgid "server busy"
 msgstr "servern är upptagen"
 
-#: lib/rfsv.cc:102
+#: lib/rfsv.cc:106
 msgid "terminated"
 msgstr "avbruten"
 
-#: lib/rfsv.cc:103
+#: lib/rfsv.cc:107
 msgid "died"
 msgstr "dog"
 
-#: lib/rfsv.cc:104
+#: lib/rfsv.cc:108
 msgid "bad handle"
 msgstr "ogiltigt handtag"
 
-#: lib/rfsv.cc:105
+#: lib/rfsv.cc:109
 msgid "invalid operation for RFSV16"
 msgstr "ogiltig funktion för RFSV16"
 
-#: lib/rfsv.cc:106
+#: lib/rfsv.cc:110
 msgid "libplp internal error"
 msgstr "internt fel i libplp"
 
-#: lib/rpcs.cc:45
+#: lib/rpcs.cc:41
 msgid "Unknown device"
 msgstr "Okänd enhet"
 
-#: lib/rpcs.cc:46
+#: lib/rpcs.cc:42
 msgid "PC"
 msgstr ""
 
-#: lib/rpcs.cc:47
+#: lib/rpcs.cc:43
 msgid "MC"
 msgstr ""
 
-#: lib/rpcs.cc:48
+#: lib/rpcs.cc:44
 msgid "HC"
 msgstr ""
 
-#: lib/rpcs.cc:49
+#: lib/rpcs.cc:45
 msgid "Series 3"
 msgstr "Serie 3"
 
-#: lib/rpcs.cc:50
+#: lib/rpcs.cc:46
 msgid "Series 3a, 3c or 3mx"
 msgstr "Serie 3a, 3c eller 3mx"
 
-#: lib/rpcs.cc:51
+#: lib/rpcs.cc:47
 msgid "Workabout"
 msgstr ""
 
-#: lib/rpcs.cc:52
+#: lib/rpcs.cc:48
 msgid "Sienna"
 msgstr ""
 
-#: lib/rpcs.cc:53
+#: lib/rpcs.cc:49
 msgid "Series 3c"
 msgstr "Serie 3c"
 
-#: lib/rpcs.cc:54
+#: lib/rpcs.cc:50
 msgid "Series 5"
 msgstr "Serie 5"
 
-#: lib/rpcs.cc:55
+#: lib/rpcs.cc:51
 msgid "WinC"
 msgstr ""
 
-#: lib/rpcs.cc:59
+#: lib/rpcs.cc:55
 msgid "Empty"
 msgstr "Tom"
 
-#: lib/rpcs.cc:60
+#: lib/rpcs.cc:56
 msgid "Very Low"
 msgstr "Mycket Låg"
 
-#: lib/rpcs.cc:61
+#: lib/rpcs.cc:57
 msgid "Low"
 msgstr "Låg"
 
-#: lib/rpcs.cc:62
+#: lib/rpcs.cc:58
 msgid "Good"
 msgstr "God"
 
-#: lib/rpcs.cc:66
+#: lib/rpcs.cc:62
 msgid "Test"
 msgstr ""
 
-#: lib/rpcs.cc:67
+#: lib/rpcs.cc:63
 msgid "English"
 msgstr "Engelska"
 
-#: lib/rpcs.cc:68
+#: lib/rpcs.cc:64
 msgid "German"
 msgstr "Tyska"
 
-#: lib/rpcs.cc:69
+#: lib/rpcs.cc:65
 msgid "French"
 msgstr "Franska"
 
-#: lib/rpcs.cc:70
+#: lib/rpcs.cc:66
 msgid "Spanish"
 msgstr "Spanska"
 
-#: lib/rpcs.cc:71
+#: lib/rpcs.cc:67
 msgid "Italian"
 msgstr "Italienska"
 
-#: lib/rpcs.cc:72
+#: lib/rpcs.cc:68
 msgid "Swedish"
 msgstr "Svenska"
 
-#: lib/rpcs.cc:73
+#: lib/rpcs.cc:69
 msgid "Danish"
 msgstr "Danska"
 
-#: lib/rpcs.cc:74
+#: lib/rpcs.cc:70
 msgid "Norwegian"
 msgstr "Norska"
 
-#: lib/rpcs.cc:75
+#: lib/rpcs.cc:71
 msgid "Finnish"
 msgstr "Finska"
 
-#: lib/rpcs.cc:76
+#: lib/rpcs.cc:72
 msgid "American"
 msgstr "Amerikanska"
 
-#: lib/rpcs.cc:77
+#: lib/rpcs.cc:73
 msgid "Swiss French"
 msgstr "Schweizisk Franska"
 
-#: lib/rpcs.cc:78
+#: lib/rpcs.cc:74
 msgid "Swiss German"
 msgstr "Schweizisk Tyska"
 
-#: lib/rpcs.cc:79
+#: lib/rpcs.cc:75
 msgid "Portugese"
 msgstr "Portugisiska"
 
-#: lib/rpcs.cc:80
+#: lib/rpcs.cc:76
 msgid "Turkish"
 msgstr "Turkiska"
 
-#: lib/rpcs.cc:81
+#: lib/rpcs.cc:77
 msgid "Icelandic"
 msgstr "Isländska"
 
-#: lib/rpcs.cc:82
+#: lib/rpcs.cc:78
 msgid "Russian"
 msgstr "Ryska"
 
-#: lib/rpcs.cc:83
+#: lib/rpcs.cc:79
 msgid "Hungarian"
 msgstr "Ungerska"
 
-#: lib/rpcs.cc:84
+#: lib/rpcs.cc:80
 msgid "Dutch"
 msgstr "Holländska"
 
-#: lib/rpcs.cc:85
+#: lib/rpcs.cc:81
 msgid "Belgian Flemish"
 msgstr "Belgisk Flamlndska"
 
-#: lib/rpcs.cc:86
+#: lib/rpcs.cc:82
 msgid "Australian"
 msgstr "Australiensk Engelska"
 
-#: lib/rpcs.cc:87
+#: lib/rpcs.cc:83
 msgid "Belgish French"
 msgstr "Belgisk Franska"
 
-#: lib/rpcs.cc:88
+#: lib/rpcs.cc:84
 msgid "Austrian"
 msgstr "Österrikiska"
 
-#: lib/rpcs.cc:89
+#: lib/rpcs.cc:85
 msgid "New Zealand"
 msgstr "Nya Zeeländska"
 
 #  FIXME: not shure about ISO code
-#: lib/rpcs.cc:90
+#: lib/rpcs.cc:86
 msgid "International French"
 msgstr "Internationell Franska"
 
 #  FIXME: not shure about ISO code
-#: lib/rpcs.cc:91
+#: lib/rpcs.cc:87
 msgid "Czech"
 msgstr "Tjeckoslovakiska"
 
-#: lib/rpcs.cc:92
+#: lib/rpcs.cc:88
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: lib/rpcs.cc:93
+#: lib/rpcs.cc:89
 msgid "Polish"
 msgstr "Polska"
 
-#: lib/rpcs.cc:94
+#: lib/rpcs.cc:90
 msgid "Slovenian"
 msgstr "Slovenska"
 
-#: lib/psitime.h:73
+#: lib/psitime.h:74
 msgid " years "
 msgstr " år "
 
-#: lib/psitime.h:73
+#: lib/psitime.h:74
 msgid " year "
 msgstr " år "
 
-#: lib/psitime.h:75
+#: lib/psitime.h:76
 msgid " days "
 msgstr " dagar "
 
-#: lib/psitime.h:75
+#: lib/psitime.h:76
 msgid " day "
 msgstr " dag "
 
-#: lib/psitime.h:77
+#: lib/psitime.h:78
 msgid " hours "
 msgstr " timmar "
 
-#: lib/psitime.h:77
+#: lib/psitime.h:78
 msgid " hour "
 msgstr " timme "
 
-#: lib/psitime.h:79
+#: lib/psitime.h:80
 msgid " minutes "
 msgstr " minuter "
 
-#: lib/psitime.h:79
+#: lib/psitime.h:80
 msgid " minute "
 msgstr " minut "
 
-#: lib/psitime.h:80 plpftp/ftp.cc:820 plpftp/ftp.cc:822 plpftp/ftp.cc:905
+#: lib/psitime.h:81 plpftp/ftp.cc:822 plpftp/ftp.cc:824 plpftp/ftp.cc:907
 msgid " seconds"
 msgstr " sekunder"
 
-#: lib/psitime.h:80
+#: lib/psitime.h:81
 msgid " second"
 msgstr " sekund"
 
-#: lib/rpcsfactory.cc:44 lib/rfsvfactory.cc:46
+#: lib/rpcsfactory.cc:39 lib/rfsvfactory.cc:42
 msgid "could not send version request"
 msgstr "kunde inte skicka versionsfråga"
 
-#: lib/rpcsfactory.cc:45 lib/rfsvfactory.cc:47
+#: lib/rpcsfactory.cc:40 lib/rfsvfactory.cc:43
 msgid "try again"
 msgstr "försök igen"
 
-#: lib/rpcsfactory.cc:46 lib/rfsvfactory.cc:48
+#: lib/rpcsfactory.cc:41 lib/rfsvfactory.cc:44
 msgid "no psion connected"
 msgstr "ingen psion ikopplad"
 
-#: lib/rpcsfactory.cc:47 lib/rfsvfactory.cc:49
+#: lib/rpcsfactory.cc:42 lib/rfsvfactory.cc:45
 msgid "wrong protocol version"
 msgstr "fel protokollversion"
 
-#: lib/rpcsfactory.cc:48 lib/rfsvfactory.cc:50
+#: lib/rpcsfactory.cc:43 lib/rfsvfactory.cc:46
 msgid "no response from ncpd"
 msgstr "inget svar från ncpd"
 
@@ -551,7 +551,7 @@ msgstr "inget svar från ncpd"
 msgid "Not present"
 msgstr "Inte tillgänglig"
 
-#: lib/plpdirent.cc:176 ncpd/link.cc:57
+#: lib/plpdirent.cc:176 ncpd/link.cc:59
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -871,7 +871,7 @@ msgstr "Namn på krav för %s är %.*s\n"
 msgid "%d .. %d (%d bytes): Req record for uid %08x\n"
 msgstr "%d .. %d (%d bytes): Kravpost för uid %08x\n"
 
-#: plpftp/main.cc:52
+#: plpftp/main.cc:55
 msgid ""
 "Usage: plpftp [OPTIONS]... [FTPCOMMAND]\n"
 "\n"
@@ -903,449 +903,449 @@ msgstr ""
 "                        Om inget är angivet är VÄRD 127.0.0.1\n"
 "                        och PORT är "
 
-#: plpftp/main.cc:71
+#: plpftp/main.cc:74
 msgid "Try `plpftp --help' for more information"
 msgstr "Prova 'plpftp --help' för mer information"
 
-#: plpftp/main.cc:84
+#: plpftp/main.cc:87
 msgid "PLPFTP Version "
 msgstr ""
 
-#: plpftp/main.cc:85
+#: plpftp/main.cc:88
 msgid " Copyright (C) 1999  Philip Proudman"
 msgstr ""
 
-#: plpftp/main.cc:86
+#: plpftp/main.cc:89
 msgid " Additions Copyright (C) 1999-2002 Fritz Elfert <felfert@to.com>"
 msgstr " Tillägg Copyright (C) 1999-2002 Fritz Elfert <felfert@to.com>"
 
-#: plpftp/main.cc:87
+#: plpftp/main.cc:90
 msgid "                   & (C) 1999 Matt Gumbley <matt@gumbley.demon.co.uk>"
 msgstr ""
 
-#: plpftp/main.cc:88
+#: plpftp/main.cc:91
 msgid "PLPFTP comes with ABSOLUTELY NO WARRANTY."
 msgstr "PLPFTP har INGEN SOM HELST GARANTI."
 
-#: plpftp/main.cc:89
+#: plpftp/main.cc:92
 msgid "This is free software, and you are welcome to redistribute it"
 msgstr "Det här är fri mjukvara, och du får gärna distribuera den"
 
-#: plpftp/main.cc:90
+#: plpftp/main.cc:93
 msgid "under GPL conditions; see the COPYING file in the distribution."
 msgstr "enligt villkoren i GPL; se filen COPYING i distributionen."
 
-#: plpftp/main.cc:92
+#: plpftp/main.cc:95
 msgid "FTP like interface started. Type \"?\" for help."
 msgstr "FTP-liknande interface startat.  Skriv \"?\" för hjälp."
 
-#: plpftp/main.cc:155
+#: plpftp/main.cc:158
 msgid "plpftp Version "
 msgstr ""
 
-#: plpftp/main.cc:170 plpftp/main.cc:175
+#: plpftp/main.cc:173 plpftp/main.cc:178
 msgid "plpftp: could not connect to ncpd"
 msgstr "plpftp: kunde inte få kontakt med ncpd"
 
-#: plpftp/ftp.cc:86
+#: plpftp/ftp.cc:88
 msgid "Known FTP commands:"
 msgstr "FTP-kommandon:"
 
-#: plpftp/ftp.cc:112
+#: plpftp/ftp.cc:114
 msgid "Known RPC commands:"
 msgstr "RPC-kommandon:"
 
-#: plpftp/ftp.cc:230
+#: plpftp/ftp.cc:232
 msgid "Connected to a "
 msgstr "Kopplad till en "
 
-#: plpftp/ftp.cc:230
+#: plpftp/ftp.cc:232
 msgid " at "
 msgstr " dag "
 
-#: plpftp/ftp.cc:231
+#: plpftp/ftp.cc:233
 msgid " baud, OwnerInfo:"
 msgstr " baud, ÄgarInformation:"
 
-#: plpftp/ftp.cc:237
+#: plpftp/ftp.cc:239
 msgid "OwnerInfo returned error "
 msgstr "ÄgarInformation returnerade fel "
 
-#: plpftp/ftp.cc:257
+#: plpftp/ftp.cc:259
 msgid "FATAL: Couldn't find default Drive"
 msgstr "FATALT: Kunde inte hitta någon enhet"
 
-#: plpftp/ftp.cc:266
+#: plpftp/ftp.cc:268
 msgid "Psion dir is: \""
 msgstr "Psion-mappen är: \""
 
-#: plpftp/ftp.cc:281
+#: plpftp/ftp.cc:283
 msgid "Prompting now "
 msgstr "Promptning är nu "
 
-#: plpftp/ftp.cc:281 plpftp/ftp.cc:286
+#: plpftp/ftp.cc:283 plpftp/ftp.cc:288
 msgid "on"
 msgstr "på"
 
-#: plpftp/ftp.cc:281 plpftp/ftp.cc:286 plpftp/ftp.cc:798 plpftp/ftp.cc:801
-#: plpftp/ftp.cc:804
+#: plpftp/ftp.cc:283 plpftp/ftp.cc:288 plpftp/ftp.cc:800 plpftp/ftp.cc:803
+#: plpftp/ftp.cc:806
 msgid "off"
 msgstr "av"
 
-#: plpftp/ftp.cc:286
+#: plpftp/ftp.cc:288
 msgid "Hash printing now "
 msgstr "Brädgårdsmarkering är nu "
 
-#: plpftp/ftp.cc:291
+#: plpftp/ftp.cc:293
 msgid "Local dir: \""
 msgstr "Lokal mapp: \""
 
-#: plpftp/ftp.cc:292
+#: plpftp/ftp.cc:294
 msgid "Psion dir: \""
 msgstr "Psion mapp: \""
 
-#: plpftp/ftp.cc:297 plpftp/ftp.cc:307 plpftp/ftp.cc:316 plpftp/ftp.cc:324
-#: plpftp/ftp.cc:332 plpftp/ftp.cc:342 plpftp/ftp.cc:354 plpftp/ftp.cc:404
-#: plpftp/ftp.cc:410 plpftp/ftp.cc:438 plpftp/ftp.cc:480 plpftp/ftp.cc:537
-#: plpftp/ftp.cc:560 plpftp/ftp.cc:586 plpftp/ftp.cc:623 plpftp/ftp.cc:651
-#: plpftp/ftp.cc:712 plpftp/ftp.cc:732 plpftp/ftp.cc:739 plpftp/ftp.cc:746
-#: plpftp/ftp.cc:786 plpftp/ftp.cc:869 plpftp/ftp.cc:879 plpftp/ftp.cc:942
-#: plpftp/ftp.cc:984 plpftp/ftp.cc:994 plpftp/ftp.cc:1015 plpftp/ftp.cc:1041
-#: plpftp/ftp.cc:1106
+#: plpftp/ftp.cc:299 plpftp/ftp.cc:309 plpftp/ftp.cc:318 plpftp/ftp.cc:326
+#: plpftp/ftp.cc:334 plpftp/ftp.cc:344 plpftp/ftp.cc:356 plpftp/ftp.cc:406
+#: plpftp/ftp.cc:412 plpftp/ftp.cc:440 plpftp/ftp.cc:482 plpftp/ftp.cc:539
+#: plpftp/ftp.cc:562 plpftp/ftp.cc:588 plpftp/ftp.cc:625 plpftp/ftp.cc:653
+#: plpftp/ftp.cc:714 plpftp/ftp.cc:734 plpftp/ftp.cc:741 plpftp/ftp.cc:748
+#: plpftp/ftp.cc:788 plpftp/ftp.cc:871 plpftp/ftp.cc:881 plpftp/ftp.cc:944
+#: plpftp/ftp.cc:986 plpftp/ftp.cc:996 plpftp/ftp.cc:1017 plpftp/ftp.cc:1043
+#: plpftp/ftp.cc:1108
 msgid "Error: "
 msgstr "Fel: "
 
-#: plpftp/ftp.cc:412
+#: plpftp/ftp.cc:414
 msgid " Entries"
 msgstr " Element"
 
-#: plpftp/ftp.cc:418
+#: plpftp/ftp.cc:420
 msgid "Drive Type Volname     Total     Free      UniqueID"
 msgstr "Enhet Typ  Volymnamn   Totalt    Ledigt    UniktID"
 
-#: plpftp/ftp.cc:496
+#: plpftp/ftp.cc:498
 msgid "No such directory"
 msgstr "Mappen finns inte"
 
-#: plpftp/ftp.cc:497 plpftp/ftp.cc:538
+#: plpftp/ftp.cc:499 plpftp/ftp.cc:540
 msgid "Keeping original directory \""
 msgstr "Behåller ursprungsmappen \""
 
-#: plpftp/ftp.cc:577 plpftp/ftp.cc:668
+#: plpftp/ftp.cc:579 plpftp/ftp.cc:670
 msgid "Transfer complete, ("
 msgstr "Överfringen klar, ("
 
-#: plpftp/ftp.cc:578 plpftp/ftp.cc:669 plpbackup/plpbackup.cc:1202
+#: plpftp/ftp.cc:580 plpftp/ftp.cc:671 plpbackup/plpbackup.cc:1204
 msgid " bytes in "
 msgstr " bytes på "
 
-#: plpftp/ftp.cc:579 plpftp/ftp.cc:670
+#: plpftp/ftp.cc:581 plpftp/ftp.cc:672
 msgid " secs = "
 msgstr " sekunder = "
 
-#: plpftp/ftp.cc:599
+#: plpftp/ftp.cc:601
 msgid "Get \""
 msgstr "Hämta \""
 
-#: plpftp/ftp.cc:628 plpftp/ftp.cc:717
+#: plpftp/ftp.cc:630 plpftp/ftp.cc:719
 msgid "Transfer complete\n"
 msgstr "Överfringen klar\n"
 
-#: plpftp/ftp.cc:694
+#: plpftp/ftp.cc:696
 msgid "Put \""
 msgstr "Skicka \""
 
-#: plpftp/ftp.cc:724
+#: plpftp/ftp.cc:726
 msgid "Error in directory name \""
 msgstr "Fel i mappnamn \""
 
-#: plpftp/ftp.cc:760
+#: plpftp/ftp.cc:762
 msgid "Starting subshell ...\n"
 msgstr "Startar kommandotolk ...\n"
 
-#: plpftp/ftp.cc:790
+#: plpftp/ftp.cc:792
 msgid "Unknown setup info received"
 msgstr ""
 
-#: plpftp/ftp.cc:793
+#: plpftp/ftp.cc:795
 msgid "Setup information:"
 msgstr ""
 
-#: plpftp/ftp.cc:794
+#: plpftp/ftp.cc:796
 msgid "  Screen contrast:                  "
 msgstr "  Skärmkontrast:                    "
 
-#: plpftp/ftp.cc:796
+#: plpftp/ftp.cc:798
 msgid "  Keyboard click:                   "
 msgstr "  Tangentbordsklick:                "
 
-#: plpftp/ftp.cc:798 plpftp/ftp.cc:801 plpftp/ftp.cc:804
+#: plpftp/ftp.cc:800 plpftp/ftp.cc:803 plpftp/ftp.cc:806
 msgid "high"
 msgstr "hög"
 
-#: plpftp/ftp.cc:798 plpftp/ftp.cc:801 plpftp/ftp.cc:804
+#: plpftp/ftp.cc:800 plpftp/ftp.cc:803 plpftp/ftp.cc:806
 msgid "low"
 msgstr "låg"
 
-#: plpftp/ftp.cc:799
+#: plpftp/ftp.cc:801
 msgid "  Screen click:                     "
 msgstr "  Skärmklick:                       "
 
-#: plpftp/ftp.cc:802
+#: plpftp/ftp.cc:804
 msgid "  Error sound:                      "
 msgstr "  Felljud:                          "
 
-#: plpftp/ftp.cc:805
+#: plpftp/ftp.cc:807
 msgid "  Auto-switch off:                  "
 msgstr "  Automatisk avstängning:           "
 
-#: plpftp/ftp.cc:808 plpftp/ftp.cc:834
+#: plpftp/ftp.cc:810 plpftp/ftp.cc:836
 msgid "never"
 msgstr "aldrig"
 
-#: plpftp/ftp.cc:811
+#: plpftp/ftp.cc:813
 msgid "if running on battery power"
 msgstr "om maskinen går på batteri"
 
-#: plpftp/ftp.cc:814 plpftp/ftp.cc:840
+#: plpftp/ftp.cc:816 plpftp/ftp.cc:842
 msgid "always"
 msgstr "alltid"
 
-#: plpftp/ftp.cc:819
+#: plpftp/ftp.cc:821
 msgid "  Switch off after:                 "
 msgstr "  Stäng av efter:                   "
 
-#: plpftp/ftp.cc:821
+#: plpftp/ftp.cc:823
 msgid "  Backlight off after:              "
 msgstr "  Släck bakgrundsbelysningen efter: "
 
-#: plpftp/ftp.cc:823
+#: plpftp/ftp.cc:825
 msgid "  Switch on when tapping on screen: "
 msgstr "  Starta när man klickar på skärmen:"
 
-#: plpftp/ftp.cc:824 plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830
-#: plpftp/ftp.cc:893 plpftp/ftp.cc:907 plpftp/ftp.cc:925
+#: plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830 plpftp/ftp.cc:832
+#: plpftp/ftp.cc:895 plpftp/ftp.cc:909 plpftp/ftp.cc:927
 msgid "yes"
 msgstr "ja"
 
-#: plpftp/ftp.cc:824 plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830
-#: plpftp/ftp.cc:893 plpftp/ftp.cc:907 plpftp/ftp.cc:925
+#: plpftp/ftp.cc:826 plpftp/ftp.cc:828 plpftp/ftp.cc:830 plpftp/ftp.cc:832
+#: plpftp/ftp.cc:895 plpftp/ftp.cc:909 plpftp/ftp.cc:927
 msgid "no"
 msgstr "nej"
 
-#: plpftp/ftp.cc:825
+#: plpftp/ftp.cc:827
 msgid "  Switch on when opening:           "
 msgstr "  Sätt på när maskinen öppnas:      "
 
-#: plpftp/ftp.cc:827
+#: plpftp/ftp.cc:829
 msgid "  Switch off when closing:          "
 msgstr "  Stäng av när maskinen stängs:     "
 
-#: plpftp/ftp.cc:829
+#: plpftp/ftp.cc:831
 msgid "  Ask for password on startup:      "
 msgstr "  Fråga efter lösenord vid start:   "
 
-#: plpftp/ftp.cc:831
+#: plpftp/ftp.cc:833
 msgid "  Show Owner info on startup:       "
 msgstr "  Visa ägarinformation vid start:   "
 
-#: plpftp/ftp.cc:837
+#: plpftp/ftp.cc:839
 msgid "once a day"
 msgstr "en gång om dagen"
 
-#: plpftp/ftp.cc:883
+#: plpftp/ftp.cc:885
 msgid "General:"
 msgstr "Allmänt:"
 
-#: plpftp/ftp.cc:884
+#: plpftp/ftp.cc:886
 msgid "  Machine Type: "
 msgstr "  Maskintyp:    "
 
-#: plpftp/ftp.cc:885
+#: plpftp/ftp.cc:887
 msgid "  Machine Name: "
 msgstr "  Maskinnamn:   "
 
-#: plpftp/ftp.cc:886
+#: plpftp/ftp.cc:888
 msgid "  Machine UID:  "
 msgstr "  Maskin UID:   "
 
-#: plpftp/ftp.cc:887
+#: plpftp/ftp.cc:889
 msgid "  UI Language:  "
 msgstr "  Användarspråk:"
 
-#: plpftp/ftp.cc:888
+#: plpftp/ftp.cc:890
 msgid "ROM:"
 msgstr ""
 
-#: plpftp/ftp.cc:889
+#: plpftp/ftp.cc:891
 msgid "  Version:      "
 msgstr ""
 
-#: plpftp/ftp.cc:891 plpftp/ftp.cc:895
+#: plpftp/ftp.cc:893 plpftp/ftp.cc:897
 msgid "  Size:         "
 msgstr "  Storlek:      "
 
-#: plpftp/ftp.cc:892
+#: plpftp/ftp.cc:894
 msgid "  Programmable: "
 msgstr "  Programmerbar:"
 
-#: plpftp/ftp.cc:894
+#: plpftp/ftp.cc:896
 msgid "RAM:"
 msgstr ""
 
-#: plpftp/ftp.cc:896
+#: plpftp/ftp.cc:898
 msgid "  Free:         "
 msgstr "  Ledigt:       "
 
-#: plpftp/ftp.cc:897
+#: plpftp/ftp.cc:899
 msgid "  Free max:     "
 msgstr "  Max ledigt:   "
 
-#: plpftp/ftp.cc:898
+#: plpftp/ftp.cc:900
 msgid "RAM disk size:  "
 msgstr "RAM-disk:       "
 
-#: plpftp/ftp.cc:899
+#: plpftp/ftp.cc:901
 msgid "Registry size:  "
 msgstr "Inställningar:  "
 
-#: plpftp/ftp.cc:900
+#: plpftp/ftp.cc:902
 msgid "Display size:   "
 msgstr "Bildskärm:      "
 
-#: plpftp/ftp.cc:902
+#: plpftp/ftp.cc:904
 msgid "Time:"
 msgstr "Tid: "
 
-#: plpftp/ftp.cc:904
+#: plpftp/ftp.cc:906
 msgid "  Current time: "
 msgstr "  Aktuell tid:  "
 
-#: plpftp/ftp.cc:905
+#: plpftp/ftp.cc:907
 msgid "  UTC offset:   "
 msgstr ""
 
-#: plpftp/ftp.cc:906
+#: plpftp/ftp.cc:908
 msgid "  DST:          "
 msgstr "  Sommartid:    "
 
-#: plpftp/ftp.cc:908
+#: plpftp/ftp.cc:910
 msgid "  Timezone:     "
 msgstr "  Tidszon:      "
 
-#: plpftp/ftp.cc:909
+#: plpftp/ftp.cc:911
 msgid "  Country Code: "
 msgstr "  Landskod:     "
 
-#: plpftp/ftp.cc:910
+#: plpftp/ftp.cc:912
 msgid "Main battery:"
 msgstr "Huvudbatteri:"
 
-#: plpftp/ftp.cc:912
+#: plpftp/ftp.cc:914
 msgid "  Changed at:   "
 msgstr "  Bytt:         "
 
-#: plpftp/ftp.cc:913 plpftp/ftp.cc:926
+#: plpftp/ftp.cc:915 plpftp/ftp.cc:928
 msgid "  Used for:     "
 msgstr "  Använt i:     "
 
-#: plpftp/ftp.cc:914 plpftp/ftp.cc:920
+#: plpftp/ftp.cc:916 plpftp/ftp.cc:922
 msgid "  Status:       "
 msgstr "  Tillstånd:    "
 
-#: plpftp/ftp.cc:915
+#: plpftp/ftp.cc:917
 msgid "  Current:      "
 msgstr " Aktuell åtgång:"
 
-#: plpftp/ftp.cc:916
+#: plpftp/ftp.cc:918
 msgid "  UsedPower:    "
 msgstr "  Använt:       "
 
-#: plpftp/ftp.cc:917 plpftp/ftp.cc:921
+#: plpftp/ftp.cc:919 plpftp/ftp.cc:923
 msgid "  Voltage:      "
 msgstr "  Spänning:     "
 
-#: plpftp/ftp.cc:918 plpftp/ftp.cc:922
+#: plpftp/ftp.cc:920 plpftp/ftp.cc:924
 msgid "  Max. voltage: "
 msgstr "  Max spänning: "
 
-#: plpftp/ftp.cc:919
+#: plpftp/ftp.cc:921
 msgid "Backup battery:"
 msgstr "Backupbatteri: "
 
-#: plpftp/ftp.cc:923
+#: plpftp/ftp.cc:925
 msgid "External power:"
 msgstr "Extern ström:  "
 
-#: plpftp/ftp.cc:924
+#: plpftp/ftp.cc:926
 msgid "  Supplied:     "
 msgstr "  Ikopplad:     "
 
-#: plpftp/ftp.cc:935
+#: plpftp/ftp.cc:937
 msgid "Could not read processlist "
 msgstr "Kunde inte läsa processlistan "
 
-#: plpftp/ftp.cc:943
+#: plpftp/ftp.cc:945
 msgid " is not a process list saved with killsave"
 msgstr " är inte en processlista som killsave har skapat"
 
-#: plpftp/ftp.cc:983
+#: plpftp/ftp.cc:985
 msgid "Could not start "
 msgstr "Kunde inte starta "
 
-#: plpftp/ftp.cc:998
+#: plpftp/ftp.cc:1000
 msgid "Could not write processlist "
 msgstr "Kunde inte skriva processlistan "
 
-#: plpftp/ftp.cc:1034
+#: plpftp/ftp.cc:1036
 msgid "no such process"
 msgstr "ingen sådan process"
 
-#: plpftp/ftp.cc:1050
+#: plpftp/ftp.cc:1052
 msgid "syntax error. Try \"help\""
 msgstr "syntax error. Prova \"help\""
 
-#: plpbackup/plpbackup.cc:100
+#: plpbackup/plpbackup.cc:102
 msgid "Could not get user's home directory from /etc/passwd"
 msgstr "Kunde inte hitta användarens hemdirectory från /etc/passwd"
 
-#: plpbackup/plpbackup.cc:120
+#: plpbackup/plpbackup.cc:122
 msgid "Could not get machine UID"
 msgstr "Kunde inte hämta maskinens UID"
 
-#: plpbackup/plpbackup.cc:140
+#: plpbackup/plpbackup.cc:142
 msgid "Could not read SIBO UID file"
 msgstr "Kunde inte parsa uid-filen"
 
-#: plpbackup/plpbackup.cc:145
+#: plpbackup/plpbackup.cc:147
 msgid "Could not get Psion owner info"
 msgstr "Kunde inte hämta ägarinformationen"
 
-#: plpbackup/plpbackup.cc:172
+#: plpbackup/plpbackup.cc:174
 msgid "Could not write SIBO UID file "
 msgstr "Kunde inte skriva uid-filen "
 
-#: plpbackup/plpbackup.cc:202
+#: plpbackup/plpbackup.cc:204
 msgid "Got signal "
 msgstr "Fick signal "
 
-#: plpbackup/plpbackup.cc:214
+#: plpbackup/plpbackup.cc:216
 msgid "Abort? (y/N) "
 msgstr "Avbryt? (y/N) "
 
-#: plpbackup/plpbackup.cc:215
+#: plpbackup/plpbackup.cc:217
 msgid "Y"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:231
+#: plpbackup/plpbackup.cc:233
 msgid "Stopping programs ..."
 msgstr "Avslutar program ..."
 
-#: plpbackup/plpbackup.cc:233
+#: plpbackup/plpbackup.cc:235
 msgid "plpbackup: Could not get process list: "
 msgstr "plpbackup: Kunde inte hämta processlistan: "
 
-#: plpbackup/plpbackup.cc:253
+#: plpbackup/plpbackup.cc:255
 msgid ""
 "Could not stop all processes. Please stop running\n"
 "programs manually on the Psion, then hit return."
@@ -1353,239 +1353,239 @@ msgstr ""
 "Kunde inte avsluta alla processer. Var vänlig avsluta\n"
 "programmen manuellt på Psionen, tryck sedan på return."
 
-#: plpbackup/plpbackup.cc:268
+#: plpbackup/plpbackup.cc:270
 msgid "Restarting programs ..."
 msgstr "Startar om programmen ..."
 
-#: plpbackup/plpbackup.cc:487
+#: plpbackup/plpbackup.cc:489
 msgid "Performing "
 msgstr "Utför "
 
-#: plpbackup/plpbackup.cc:489
+#: plpbackup/plpbackup.cc:491
 msgid "format"
 msgstr "formattering"
 
-#: plpbackup/plpbackup.cc:492 plpbackup/plpbackup.cc:507
-#: plpbackup/plpbackup.cc:722
+#: plpbackup/plpbackup.cc:494 plpbackup/plpbackup.cc:509
+#: plpbackup/plpbackup.cc:724
 msgid " and "
 msgstr " och "
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 msgid "restore"
 msgstr "återställning"
 
-#: plpbackup/plpbackup.cc:495
+#: plpbackup/plpbackup.cc:497
 msgid "full"
 msgstr "fullständig"
 
-#: plpbackup/plpbackup.cc:495
+#: plpbackup/plpbackup.cc:497
 msgid "incremental"
 msgstr "inkrementell"
 
-#: plpbackup/plpbackup.cc:495
+#: plpbackup/plpbackup.cc:497
 msgid " backup"
 msgstr " backup"
 
-#: plpbackup/plpbackup.cc:496
+#: plpbackup/plpbackup.cc:498
 msgid " of "
 msgstr " av "
 
-#: plpbackup/plpbackup.cc:498
+#: plpbackup/plpbackup.cc:500
 msgid "all drives"
 msgstr "alla enheter"
 
-#: plpbackup/plpbackup.cc:500
+#: plpbackup/plpbackup.cc:502
 msgid "Drive "
 msgstr "Enhet "
 
-#: plpbackup/plpbackup.cc:513
+#: plpbackup/plpbackup.cc:515
 msgid " to "
 msgstr " till "
 
-#: plpbackup/plpbackup.cc:515
+#: plpbackup/plpbackup.cc:517
 msgid " from "
 msgstr " från "
 
-#: plpbackup/plpbackup.cc:715
+#: plpbackup/plpbackup.cc:717
 msgid "It contains Backups of drive "
 msgstr "Den innehåller backuper från enhet "
 
-#: plpbackup/plpbackup.cc:735
+#: plpbackup/plpbackup.cc:737
 msgid ""
 "Select (I)ndividual files, (W)hole archive, (N)one from this archive? (I/W/"
 "N) "
 msgstr "Välj (E)nstaka fil, (H)ela arkivet, (I)ngenting? (E/H/I) "
 
-#: plpbackup/plpbackup.cc:737
+#: plpbackup/plpbackup.cc:739
 msgid "IWA"
 msgstr "EHI"
 
-#: plpbackup/plpbackup.cc:761
+#: plpbackup/plpbackup.cc:763
 msgid "Could not run external editor"
 msgstr "Kunde inte starta externa editorn"
 
-#: plpbackup/plpbackup.cc:794
+#: plpbackup/plpbackup.cc:796
 msgid ""
 "Archive skipped, because it does not contain any files on selected drives"
 msgstr ""
 "Arkivet hoppas över, eftersom det inte innehåller några filer från den valda "
 "enheten"
 
-#: plpbackup/plpbackup.cc:838
+#: plpbackup/plpbackup.cc:840
 msgid "(O)verwrite, overwrite (A)ll, (S)kip? (O/A/S) "
 msgstr "(S)kriv över, skriv över (A)lla, (H)oppa över (S/A/H) "
 
-#: plpbackup/plpbackup.cc:839
+#: plpbackup/plpbackup.cc:841
 msgid "OAS"
 msgstr "SAH"
 
-#: plpbackup/plpbackup.cc:880
+#: plpbackup/plpbackup.cc:882
 msgid "Could not get backup index"
 msgstr "Kunde inte hitta backupens index"
 
-#: plpbackup/plpbackup.cc:888
+#: plpbackup/plpbackup.cc:890
 msgid "' is a full backup"
 msgstr "' är en full backup"
 
-#: plpbackup/plpbackup.cc:892
+#: plpbackup/plpbackup.cc:894
 msgid "' is an incremental backup"
 msgstr "' är en inkrementell backup"
 
-#: plpbackup/plpbackup.cc:897
+#: plpbackup/plpbackup.cc:899
 msgid "' is NOT a plpbackup"
 msgstr "' är INTE en plpbackup"
 
-#: plpbackup/plpbackup.cc:934
+#: plpbackup/plpbackup.cc:936
 msgid "Extracting tar archive ..."
 msgstr "Skapar tar-arkiv ..."
 
-#: plpbackup/plpbackup.cc:936
+#: plpbackup/plpbackup.cc:938
 msgid "Execution of "
 msgstr "Körning av "
 
-#: plpbackup/plpbackup.cc:936
+#: plpbackup/plpbackup.cc:938
 msgid " failed."
 msgstr " misslyckades."
 
-#: plpbackup/plpbackup.cc:945 plpbackup/plpbackup.cc:1032
-#: plpbackup/plpbackup.cc:1080
+#: plpbackup/plpbackup.cc:947 plpbackup/plpbackup.cc:1034
+#: plpbackup/plpbackup.cc:1082
 msgid "Restore aborted by user"
 msgstr "Backup avbruten av användaren"
 
-#: plpbackup/plpbackup.cc:953 plpbackup/plpbackup.cc:1072
+#: plpbackup/plpbackup.cc:955 plpbackup/plpbackup.cc:1074
 msgid "Restore "
 msgstr "Återställ "
 
-#: plpbackup/plpbackup.cc:966
+#: plpbackup/plpbackup.cc:968
 msgid "Could not create directory "
 msgstr "Kunde inte skapa mapp "
 
-#: plpbackup/plpbackup.cc:982
+#: plpbackup/plpbackup.cc:984
 msgid "Could not create "
 msgstr "Kunde inte skapa "
 
-#: plpbackup/plpbackup.cc:992
+#: plpbackup/plpbackup.cc:994
 msgid "Could not get attributes of "
 msgstr "Kunde inte läsa attributen för "
 
-#: plpbackup/plpbackup.cc:1009
+#: plpbackup/plpbackup.cc:1011
 msgid "Could not set attributes of"
 msgstr "Kunde inte sätta attributen för"
 
-#: plpbackup/plpbackup.cc:1021
+#: plpbackup/plpbackup.cc:1023
 msgid "Could not set modification time of "
 msgstr "Kunde inte sätta tiden för modifiering för "
 
-#: plpbackup/plpbackup.cc:1044 plpbackup/plpbackup.cc:1246
+#: plpbackup/plpbackup.cc:1046 plpbackup/plpbackup.cc:1248
 msgid "Skipping "
 msgstr "Hoppar över "
 
-#: plpbackup/plpbackup.cc:1047 plpbackup/plpbackup.cc:1087
+#: plpbackup/plpbackup.cc:1049 plpbackup/plpbackup.cc:1089
 msgid "Error during restore of "
 msgstr "Fel under återställning av "
 
-#: plpbackup/plpbackup.cc:1053 plpbackup/plpbackup.cc:1255
+#: plpbackup/plpbackup.cc:1055 plpbackup/plpbackup.cc:1257
 msgid "STAR"
 msgstr "HDAF"
 
-#: plpbackup/plpbackup.cc:1055 plpbackup/plpbackup.cc:1257
+#: plpbackup/plpbackup.cc:1057 plpbackup/plpbackup.cc:1259
 msgid "(S)kip all, Skip (t)his, (A)bort, (R)etry: "
 msgstr "(H)oppa över alla, hoppa över (D)en här, (A)vbryt, (F)örsök igen: "
 
-#: plpbackup/plpbackup.cc:1106 plpbackup/plpbackup.cc:1394
+#: plpbackup/plpbackup.cc:1108 plpbackup/plpbackup.cc:1396
 msgid "Total time elapsed:     "
 msgstr "Totalt åtgången tid:    "
 
-#: plpbackup/plpbackup.cc:1140 plpbackup/plpbackup.cc:1192
-#: plpbackup/plpbackup.cc:1234 plpbackup/plpbackup.cc:1283
+#: plpbackup/plpbackup.cc:1142 plpbackup/plpbackup.cc:1194
+#: plpbackup/plpbackup.cc:1236 plpbackup/plpbackup.cc:1285
 msgid "Backup aborted by user"
 msgstr "Backup avbruten av användaren"
 
-#: plpbackup/plpbackup.cc:1159 plpbackup/plpbackup.cc:1177
+#: plpbackup/plpbackup.cc:1161 plpbackup/plpbackup.cc:1179
 msgid "Scanning Drive "
 msgstr "Går igenom enhet "
 
-#: plpbackup/plpbackup.cc:1172
+#: plpbackup/plpbackup.cc:1174
 msgid "plpbackup: Couldn't get Drive list"
 msgstr "plpbackup: Kunde inte hämta listan på enheter"
 
-#: plpbackup/plpbackup.cc:1202
+#: plpbackup/plpbackup.cc:1204
 msgid "Size of backup: "
 msgstr "Backupens storlek: "
 
-#: plpbackup/plpbackup.cc:1203
+#: plpbackup/plpbackup.cc:1205
 msgid " files."
 msgstr " filer."
 
-#: plpbackup/plpbackup.cc:1206
+#: plpbackup/plpbackup.cc:1208
 msgid "Nothing to backup"
 msgstr "Ingenting att kopiera"
 
-#: plpbackup/plpbackup.cc:1222 plpbackup/plpbackup.cc:1275
+#: plpbackup/plpbackup.cc:1224 plpbackup/plpbackup.cc:1277
 msgid "Backing up "
 msgstr "Kopierar "
 
-#: plpbackup/plpbackup.cc:1249 plpbackup/plpbackup.cc:1290
+#: plpbackup/plpbackup.cc:1251 plpbackup/plpbackup.cc:1292
 msgid "Error during backup of "
 msgstr "Fel under kopiering av "
 
-#: plpbackup/plpbackup.cc:1309
+#: plpbackup/plpbackup.cc:1311
 msgid "Writing index ..."
 msgstr "Skriver innehållslista ..."
 
-#: plpbackup/plpbackup.cc:1336
+#: plpbackup/plpbackup.cc:1338
 msgid "plpbackup: Could not write index "
 msgstr "plpbackup: Kunde inte skriva innehållslista "
 
-#: plpbackup/plpbackup.cc:1346
+#: plpbackup/plpbackup.cc:1348
 msgid "Creating tar archive ..."
 msgstr "Skapar tar-arkiv ..."
 
-#: plpbackup/plpbackup.cc:1359
+#: plpbackup/plpbackup.cc:1361
 msgid "plpbackup: Error during execution of "
 msgstr "plpbackup: Fel under körning av "
 
-#: plpbackup/plpbackup.cc:1369
+#: plpbackup/plpbackup.cc:1371
 msgid "Resetting archive attributes ..."
 msgstr "Återställer arkiveringsattribut ..."
 
-#: plpbackup/plpbackup.cc:1388
+#: plpbackup/plpbackup.cc:1390
 msgid "Backup aborted due to error"
 msgstr "Kopiering avbruten på grund av fel"
 
-#: plpbackup/plpbackup.cc:1396
+#: plpbackup/plpbackup.cc:1398
 msgid "Time for scanning:      "
 msgstr "Tid för genomgång:      "
 
-#: plpbackup/plpbackup.cc:1399
+#: plpbackup/plpbackup.cc:1401
 msgid "Time for transfer:      "
 msgstr "Tid för överföring:     "
 
-#: plpbackup/plpbackup.cc:1401
+#: plpbackup/plpbackup.cc:1403
 msgid "Average transfer speed: "
 msgstr "Överföringshastighet:   "
 
-#: plpbackup/plpbackup.cc:1412
+#: plpbackup/plpbackup.cc:1414
 msgid ""
 "Usage: plpbackup OPTIONS [<drive>:] [<drive>:] ...\n"
 "\n"
@@ -1619,31 +1619,31 @@ msgstr ""
 "  <enhet> En enhetsbokstav. Om ingen anges, gå igenom alla enheter.\n"
 "\n"
 
-#: plpbackup/plpbackup.cc:1429
+#: plpbackup/plpbackup.cc:1431
 msgid "Try 'plpbackup --help' for more information."
 msgstr "Prova 'plpbackup --help' för mer information."
 
-#: plpbackup/plpbackup.cc:1500
+#: plpbackup/plpbackup.cc:1502
 msgid "plpbackup version "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:1538
+#: plpbackup/plpbackup.cc:1540
 msgid "Invalid drive argument "
 msgstr "Ogiltig enhetsbokstav "
 
-#: plpbackup/plpbackup.cc:1544
+#: plpbackup/plpbackup.cc:1546
 msgid "Backup mode can not be combined with format or restore."
 msgstr "Backup-läget kan inte kombineras med formattering eller återställning."
 
-#: plpbackup/plpbackup.cc:1549
+#: plpbackup/plpbackup.cc:1551
 msgid "Format mode needs at least one drive specified."
 msgstr "Formatläget kräver minst en enhetsbokstav."
 
-#: plpbackup/plpbackup.cc:1553
+#: plpbackup/plpbackup.cc:1555
 msgid "Backup can only create one archive at a time."
 msgstr "Backup kan bara skapa ett arkiv i taget."
 
-#: plpbackup/plpbackup.cc:1562 plpbackup/plpbackup.cc:1567
+#: plpbackup/plpbackup.cc:1564 plpbackup/plpbackup.cc:1569
 msgid "plpbackup: could not connect to ncpd"
 msgstr "plpbackup: fick ingen kontakt med ncpd"
 
@@ -1712,15 +1712,15 @@ msgstr "Kunde inte parsa sisfilen.\n"
 msgid "Installation complete. Press any key to exit."
 msgstr "Installationen klar. Tryck valfri tangent för att avsluta."
 
-#: ncpd/main.cc:79
+#: ncpd/main.cc:81
 msgid "Got SIGTERM"
 msgstr ""
 
-#: ncpd/main.cc:87
+#: ncpd/main.cc:89
 msgid "Got SIGINT"
 msgstr ""
 
-#: ncpd/main.cc:147
+#: ncpd/main.cc:149
 msgid ""
 "Usage: ncpd [OPTIONS]...\n"
 "\n"
@@ -1745,51 +1745,51 @@ msgid ""
 " -b, --baudrate=RATE     Set serial speed to BAUD.\n"
 msgstr ""
 
-#: ncpd/main.cc:172
+#: ncpd/main.cc:174
 msgid "                         Default: "
 msgstr ""
 
-#: ncpd/main.cc:174
+#: ncpd/main.cc:176
 msgid ""
 "                         Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n"
 msgstr ""
 
-#: ncpd/main.cc:177
+#: ncpd/main.cc:179
 msgid ""
 " -p, --port=[HOST:]PORT  Listen on host HOST, port PORT.\n"
 "                         Default for HOST: 127.0.0.1\n"
 "                         Default for PORT: "
 msgstr ""
 
-#: ncpd/main.cc:185
+#: ncpd/main.cc:187
 msgid "Try `ncpd --help' for more information"
 msgstr "Prova `ncpd --help' för mer information"
 
-#: ncpd/main.cc:277
+#: ncpd/main.cc:279
 msgid "ncpd Version "
 msgstr ""
 
-#: ncpd/main.cc:358
+#: ncpd/main.cc:360
 msgid "daemon started. Listening at "
 msgstr "daemon startad. Lyssnar på "
 
-#: ncpd/main.cc:359
+#: ncpd/main.cc:361
 msgid " using device "
 msgstr " använder enhet "
 
-#: ncpd/main.cc:391
+#: ncpd/main.cc:393
 msgid "terminating"
 msgstr "avbruten"
 
-#: ncpd/link.cc:58
+#: ncpd/link.cc:60
 msgid "SIBO"
 msgstr ""
 
-#: ncpd/link.cc:59
+#: ncpd/link.cc:61
 msgid "EPOC"
 msgstr ""
 
-#: plpnfsd/main.cc:477
+#: plpnfsd/main.cc:479
 msgid ""
 "Usage: plpnfsd [OPTIONS]...\n"
 "\n"
@@ -1806,14 +1806,14 @@ msgid ""
 "                         Default for PORT is "
 msgstr ""
 
-#: plpnfsd/main.cc:495
+#: plpnfsd/main.cc:497
 msgid "Try `plpnfsd --help' for more information"
 msgstr "Prova 'plpnfsd --help' för mer information"
 
-#: plpnfsd/main.cc:562
+#: plpnfsd/main.cc:564
 msgid "plpnfsd Version "
 msgstr ""
 
-#: plpprint/plpprintd.cc:1023
+#: plpprint/plpprintd.cc:1024
 msgid "plpprintd: could not connect to ncpd"
 msgstr "plpprintd: kunde inte få kontakt med ncpd"