3 files changed, 22 insertions, 14 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 2aac9ff..7478ffd 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,15 +1,18 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.9 ************
 
 KO/Pi:
 Fixed some problems of the new search options in the search dialog.
 
+PwM/Pi:
+Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
+
 ********** VERSION 2.1.8 ************
 
 KO/Pi:
 Added info about the completion state of a todo in the ListView/Searchdialog.
 If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
 Fixed some updating problems when changing the filter.
 
 KA/Pi:
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index 255f2eb..d38eecf 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -278,18 +278,18 @@
 { "SHA-256 (256 bit)","SHA-256 (256 bit)" },

 { "SHA-384 (384 bit)","SHA-384 (384 bit)" },

 { "SHA-512 (512 bit)","SHA-512 (512 bit)" },

 { "MD5 (128 bit)","MD5 (128 bit)" },

 { "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" },

 { "Tiger (192 bit)","Tiger (192 bit)" },

 { "Permissions:","Zugriffsrechte:" },

 { "Make backup before saving","Mache Backup vor dem Speichern" },

-{ "Password timeout\n(timeout to hold password in\nmemory,so you don't have to\nre-enter it,if you\nalready have entered it)\n[set to 0 to disable]:","Passwort Timeout\n(Timeout um das Passwort\nim Speicher zu halten,\nso dass es nicht noch mal\neingegeben werden muß.)\n[Setze auf 0 zum deaktivieren]:" },

-{ "Auto-lock timeout\n(auto lock document after this\namount of seconds)\n[set to 0 to disable]:","(Total-)Sperr-Timeout\n(Sperre Dokument total nach\ndieser Anzahl Sekunden)\n[Setze auf 0 zum deaktivieren]:" },

+{ "<b>Password timeout</b> (timeout to hold password in memory,so you don't have to re-enter it,if you already have entered it) [set to 0 to disable]:","<b>Passwort Timeout</b> (Timeout um das Passwort im Speicher zu halten,so dass es nicht noch mal eingegeben werden muß.) [Setze auf 0 zum deaktivieren]:" },

+{ "<b>Auto-lock timeout</b> (auto lock document after this\namount of seconds) [set to 0 to disable]:","<b>(Total-)Sperr-Timeout</b> (Sperre Dokument total nach dieser Anzahl Sekunden) [Setze auf 0 zum deaktivieren]:" },

 { "deep-lock on autolock","Sperre total beim Sperr-Timeout" },

 { "open deeplocked","Öffne total gesperrt" },

 { "Favourite browser:","Bevorzugter Browser:" },

 { "Favourite x-terminal:","Bevorzugtes x-terminal:" },

 { "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" },

 { "Look && feel","Aussehen" },

 { "File","Datei" },

 { "Timeout","Timeout" },

@@ -364,15 +364,15 @@
 { "Try again later","Versuche später nochmal" },

 { "Try again tomorrow","Versuche morgen nochmal" },

 { "Disable backup","Schalte Backup ab" },

 { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },

 { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },

 { "Choose action","Wähle Aktion" },

 { "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." },

 { "Global Settings...","Globale Einstellungen..." },

-{ "","" },

+{ " sec"," Sek" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 

diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
index c1ca536..2c5189c 100644
--- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
@@ -153,32 +153,37 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
 
   // Timeout page
   //////////////////////////////////////////////////////
   QWidget *timeoutPage = new QWidget( this );
   QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2);
 
   i = 0;
   pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" );
-  QLabel* timeoutLabel = new QLabel(pwTimeoutSpinBox, i18n("Password timeout\n(timeout to hold password in\nmemory,so you don't have to\nre-enter it,if you\nalready have entered it)\n[set to 0 to disable]:"), timeoutPage);
-  timeoutLayout->addMultiCellWidget(timeoutLabel,i, i, 0 ,0);
-  timeoutLayout->addWidget(pwTimeoutSpinBox,i,1);
+  QLabel* timeoutLabel = new QLabel(pwTimeoutSpinBox, i18n("<b>Password timeout</b> (timeout to hold password in memory,so you don't have to re-enter it,if you already have entered it) [set to 0 to disable]:"), timeoutPage);
+  timeoutLayout->addMultiCellWidget(timeoutLabel, i, i, 0 ,1);
   ++i;
-
+  timeoutLayout->addMultiCellWidget(pwTimeoutSpinBox,i,i,0,1);
+  ++i;
+  pwTimeoutSpinBox->setSuffix ( i18n(" sec") );
   lockTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "lockTimeoutSpinBox" );
-  QLabel* lockTimeoutLabel = new QLabel(lockTimeoutSpinBox, i18n("Auto-lock timeout\n(auto lock document after this\namount of seconds)\n[set to 0 to disable]:"), timeoutPage);
-  timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,0);
-  timeoutLayout->addWidget(lockTimeoutSpinBox,i,1);
+  QLabel* lockTimeoutLabel = new QLabel(lockTimeoutSpinBox, i18n("<b>Auto-lock timeout</b> (auto lock document after this\namount of seconds) [set to 0 to disable]:"), timeoutPage);
+  timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,1);
+  ++i;
+  timeoutLayout->addMultiCellWidget(lockTimeoutSpinBox,i,i,0,1);
+  lockTimeoutSpinBox->setSuffix ( i18n(" sec") );
   ++i;
 
   sb = addWidBool(i18n("deep-lock on autolock"),
                       &(prefs->mAutoDeeplock),timeoutPage);
   timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
- 
+   sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),timeoutPage);
+  timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
+  ++i;   
 
   // Autostart page
   //////////////////////////////////////////////////////
   QWidget *autostartPage = new QWidget( this );
   QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2);
 
   i = 0;
 
@@ -209,17 +214,17 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   ++i;
 
   xtermLineEdit = new QLineEdit(externalappPage);
   QLabel* xtermLineLabel = new QLabel(xtermLineEdit, i18n("Favourite x-terminal:"), externalappPage);
   externalappLayout->addWidget(xtermLineLabel,i,0);
   externalappLayout->addWidget(xtermLineEdit,i,1);
   ++i;
 
-
+#if 0
   // miscelaneous page
   //////////////////////////////////////////////////////
   QWidget *miscPage = new QWidget( this );
   QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2);
 
   i = 0;
 
   /*US ENH: PWM/Pi has no tray and con be minimized
@@ -247,24 +252,24 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   sb = addWidBool(i18n("KWallet emulation"),&(prefs->mKWalletEmu),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   sb = addWidBool(i18n("Close instead Minimize into tray"),&(prefs->mClose),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
   */
-
+#endif
 
   tabWidget->addTab( windowStylePage, i18n( "Look && feel" ) );
   tabWidget->addTab( filePage, i18n( "File" ) );
   tabWidget->addTab( timeoutPage, i18n( "Timeout" ) );
   tabWidget->addTab( autostartPage, i18n( "Autostart" ) );
   tabWidget->addTab( externalappPage, i18n( "External apps" ) );
-  tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) );
+  //tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) );
 
 
   connect( permissionLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
   connect( pwTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) );
   connect( lockTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) );
   connect( autostartLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
   connect( browserLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
   connect( xtermLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );