summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-24 23:30:30 (UTC)
committer zautrix <zautrix>2005-06-24 23:30:30 (UTC)
commit184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8 (patch) (unidiff)
tree96074dff5dddd80afa2773f0bf573e0155f73293
parent3dbc82b2711811450b77b85a5fd85744a61d0a2c (diff)
downloadkdepimpi-184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8.zip
kdepimpi-184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8.tar.gz
kdepimpi-184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8.tar.bz2
sec fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--bin/kdepim/pwmanager/germantranslation.txt6
-rw-r--r--pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp27
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,55 +1,58 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.1.9 ************ 3********** VERSION 2.1.9 ************
4 4
5KO/Pi: 5KO/Pi:
6Fixed some problems of the new search options in the search dialog. 6Fixed some problems of the new search options in the search dialog.
7 7
8PwM/Pi:
9Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
10
8********** VERSION 2.1.8 ************ 11********** VERSION 2.1.8 ************
9 12
10KO/Pi: 13KO/Pi:
11Added info about the completion state of a todo in the ListView/Searchdialog. 14Added info about the completion state of a todo in the ListView/Searchdialog.
12If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. 15If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
13Fixed some updating problems when changing the filter. 16Fixed some updating problems when changing the filter.
14 17
15KA/Pi: 18KA/Pi:
16In the addressee selection dialog now the formatted name is shown, if not empty. 19In the addressee selection dialog now the formatted name is shown, if not empty.
17Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. 20Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
18Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. 21Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
19 22
20Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored. 23Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
21Fixed the sorting for size in the file selector on the Z. 24Fixed the sorting for size in the file selector on the Z.
22 25
23Changed the color selection dialog on the Zaurus to a more user friendly version. 26Changed the color selection dialog on the Zaurus to a more user friendly version.
24 27
25********** VERSION 2.1.7 ************ 28********** VERSION 2.1.7 ************
26 29
27KO/Pi: 30KO/Pi:
28Fixed several problems in the new Resource handling. 31Fixed several problems in the new Resource handling.
29Added more options to the search dialog. 32Added more options to the search dialog.
30Fixed a problem in the Month view. 33Fixed a problem in the Month view.
31Added more options to the dialog when setting a todo to stopped. 34Added more options to the dialog when setting a todo to stopped.
32 35
33Fixed two small problems in KO/Pi Alarm applet. 36Fixed two small problems in KO/Pi Alarm applet.
34 37
35********** VERSION 2.1.6 ************ 38********** VERSION 2.1.6 ************
36 39
37This release is for testing only. 40This release is for testing only.
38 41
39KO/Pi: 42KO/Pi:
40Added to the list view (the list view is used in search dialog as well) the possibility to print it. 43Added to the list view (the list view is used in search dialog as well) the possibility to print it.
41Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. 44Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
42Added to the list view the possibility to add all subtodos of selected todos to an export/beam. 45Added to the list view the possibility to add all subtodos of selected todos to an export/beam.
43Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. 46Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout.
44Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. 47Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus.
45Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. 48Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly.
46 49
47Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. 50Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars.
48In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. 51In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later.
49Now on every sync the set of calendars is synced which are enabled in the resource view. 52Now on every sync the set of calendars is synced which are enabled in the resource view.
50 53
51A calendar is enabled in the resource view if the "eye" column is checked. 54A calendar is enabled in the resource view if the "eye" column is checked.
52You can set a calendar to be the default for new items( "+" column ). 55You can set a calendar to be the default for new items( "+" column ).
53You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly. 56You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly.
54To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ... 57To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ...
55 58
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
@@ -238,141 +238,141 @@
238{ "copy username to clipboard","Kopiere Benutzername ins Clipboard" }, 238{ "copy username to clipboard","Kopiere Benutzername ins Clipboard" },
239{ "copy description to clipboard","Kopiere Beschreibung ins Clipboard" }, 239{ "copy description to clipboard","Kopiere Beschreibung ins Clipboard" },
240{ "copy url to clipboard","Kopiere URL ins Clipboard" }, 240{ "copy url to clipboard","Kopiere URL ins Clipboard" },
241{ "copy launcher to clipboard","Kopiere Launcher ins Clipboard" }, 241{ "copy launcher to clipboard","Kopiere Launcher ins Clipboard" },
242{ "copy comment to clipboard","Kopiere Kommentare ins Clipboard" }, 242{ "copy comment to clipboard","Kopiere Kommentare ins Clipboard" },
243{ "Execute "Launcher"",""Launcher" ausführen" }, 243{ "Execute "Launcher"",""Launcher" ausführen" },
244{ "Go to "URL"","Gehe zu "URL"" }, 244{ "Go to "URL"","Gehe zu "URL"" },
245{ "Ready.","Fertig." }, 245{ "Ready.","Fertig." },
246{ "password filename(*.pwm)","passwort dateiname(*.pwm)" }, 246{ "password filename(*.pwm)","passwort dateiname(*.pwm)" },
247{ "File error","Datei Fehler" }, 247{ "File error","Datei Fehler" },
248{ "Could not read file!","Kann Datei nicht lesen!" }, 248{ "Could not read file!","Kann Datei nicht lesen!" },
249{ "Master-password","Master-Passwort" }, 249{ "Master-password","Master-Passwort" },
250{ "Please enter the master-password:","Bitter Master-Passwort eingeben:" }, 250{ "Please enter the master-password:","Bitter Master-Passwort eingeben:" },
251{ "Wrong master-password!\nPlease try again.","Falsches Master-Passwort!\nBitte erneut versuchen." }, 251{ "Wrong master-password!\nPlease try again.","Falsches Master-Passwort!\nBitte erneut versuchen." },
252{ "password error","Passwort Fehler" }, 252{ "password error","Passwort Fehler" },
253{ "Successfully opened file.","Datei erfolgreich geöffnet." }, 253{ "Successfully opened file.","Datei erfolgreich geöffnet." },
254{ "DEEP-LOCKED","TOTAL-GESPERRT" }, 254{ "DEEP-LOCKED","TOTAL-GESPERRT" },
255{ "This file is DEEP-LOCKED!\nThat means all data has been encrypted\nand written out to the file. If you want\nto see the entries, please UNLOCK the file.\nWhile unlocking, you will be prompted for the\nmaster-password or the key-card.","Diese Datei ist TOTAL-GESPERRT!\nDas bedeutet, dass alle Daten verschlüsselt\nsind und in die Datei geschrieben wurden.\nWenn Sie die Einträge sehen möchten\nENTSPERREN Sie bitte die Datei.\nZum Entsperren werden Sie nach\ndem Master-Passwort gefragt." }, 255{ "This file is DEEP-LOCKED!\nThat means all data has been encrypted\nand written out to the file. If you want\nto see the entries, please UNLOCK the file.\nWhile unlocking, you will be prompted for the\nmaster-password or the key-card.","Diese Datei ist TOTAL-GESPERRT!\nDas bedeutet, dass alle Daten verschlüsselt\nsind und in die Datei geschrieben wurden.\nWenn Sie die Einträge sehen möchten\nENTSPERREN Sie bitte die Datei.\nZum Entsperren werden Sie nach\ndem Master-Passwort gefragt." },
256{ "<LOCKED>","<GESPERRT>" }, 256{ "<LOCKED>","<GESPERRT>" },
257{ "To unlock click the icon on the left.","Zum Entsperren auf linkes Icon klicken." }, 257{ "To unlock click the icon on the left.","Zum Entsperren auf linkes Icon klicken." },
258{ "PwManager","PwManager" }, 258{ "PwManager","PwManager" },
259{ "Window-style:","Window-Stil:" }, 259{ "Window-style:","Window-Stil:" },
260{ "Category on top","Kategorien oben" }, 260{ "Category on top","Kategorien oben" },
261{ "Category-list left/top","Kategorien links oben" }, 261{ "Category-list left/top","Kategorien links oben" },
262{ "Font for Password entries:","Schrift für Passwort Einträge:" }, 262{ "Font for Password entries:","Schrift für Passwort Einträge:" },
263{ "Font for Password summary:","Schrift für Passwort Übersicht:" }, 263{ "Font for Password summary:","Schrift für Passwort Übersicht:" },
264{ "Font:","Schriftart:" }, 264{ "Font:","Schriftart:" },
265{ "Summary","Übersicht" }, 265{ "Summary","Übersicht" },
266{ "Compression:","Kompression:" }, 266{ "Compression:","Kompression:" },
267{ "gzip","gzip" }, 267{ "gzip","gzip" },
268{ "Encryption:","Verschlüsselung:" }, 268{ "Encryption:","Verschlüsselung:" },
269{ "Blowfish (128 bit)","Blowfish (128 bit)" }, 269{ "Blowfish (128 bit)","Blowfish (128 bit)" },
270{ "AES-128, Rijndael (128 bit)","AES-128, Rijndael (128 bit)" }, 270{ "AES-128, Rijndael (128 bit)","AES-128, Rijndael (128 bit)" },
271{ "AES-192, Rijndael (192 bit)","AES-192, Rijndael (192 bit)" }, 271{ "AES-192, Rijndael (192 bit)","AES-192, Rijndael (192 bit)" },
272{ "AES-256, Rijndael (256 bit)","AES-256, Rijndael (256 bit)" }, 272{ "AES-256, Rijndael (256 bit)","AES-256, Rijndael (256 bit)" },
273{ "Triple-DES (168 bit)","Triple-DES (168 bit)" }, 273{ "Triple-DES (168 bit)","Triple-DES (168 bit)" },
274{ "Twofish (256 bit)","Twofish (256 bit)" }, 274{ "Twofish (256 bit)","Twofish (256 bit)" },
275{ "Twofish-128 (128 bit)","Twofish-128 (128 bit)" }, 275{ "Twofish-128 (128 bit)","Twofish-128 (128 bit)" },
276{ "Hashing:","Hashing:" }, 276{ "Hashing:","Hashing:" },
277{ "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" }, 277{ "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" },
278{ "SHA-256 (256 bit)","SHA-256 (256 bit)" }, 278{ "SHA-256 (256 bit)","SHA-256 (256 bit)" },
279{ "SHA-384 (384 bit)","SHA-384 (384 bit)" }, 279{ "SHA-384 (384 bit)","SHA-384 (384 bit)" },
280{ "SHA-512 (512 bit)","SHA-512 (512 bit)" }, 280{ "SHA-512 (512 bit)","SHA-512 (512 bit)" },
281{ "MD5 (128 bit)","MD5 (128 bit)" }, 281{ "MD5 (128 bit)","MD5 (128 bit)" },
282{ "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" }, 282{ "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" },
283{ "Tiger (192 bit)","Tiger (192 bit)" }, 283{ "Tiger (192 bit)","Tiger (192 bit)" },
284{ "Permissions:","Zugriffsrechte:" }, 284{ "Permissions:","Zugriffsrechte:" },
285{ "Make backup before saving","Mache Backup vor dem Speichern" }, 285{ "Make backup before saving","Mache Backup vor dem Speichern" },
286{ "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]:" }, 286{ "<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]:" },
287{ "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]:" }, 287{ "<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]:" },
288{ "deep-lock on autolock","Sperre total beim Sperr-Timeout" }, 288{ "deep-lock on autolock","Sperre total beim Sperr-Timeout" },
289{ "open deeplocked","Öffne total gesperrt" }, 289{ "open deeplocked","Öffne total gesperrt" },
290{ "Favourite browser:","Bevorzugter Browser:" }, 290{ "Favourite browser:","Bevorzugter Browser:" },
291{ "Favourite x-terminal:","Bevorzugtes x-terminal:" }, 291{ "Favourite x-terminal:","Bevorzugtes x-terminal:" },
292{ "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" }, 292{ "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" },
293{ "Look && feel","Aussehen" }, 293{ "Look && feel","Aussehen" },
294{ "File","Datei" }, 294{ "File","Datei" },
295{ "Timeout","Timeout" }, 295{ "Timeout","Timeout" },
296{ "Autostart","Autostart" }, 296{ "Autostart","Autostart" },
297{ "External apps","Externe Applik." }, 297{ "External apps","Externe Applik." },
298{ "Miscellaneous","Verschiedenes" }, 298{ "Miscellaneous","Verschiedenes" },
299{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, 299{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
300{ "edit category descriptions","Ändere Label für Kategorie" }, 300{ "edit category descriptions","Ändere Label für Kategorie" },
301{ "Close","Schließen" }, 301{ "Close","Schließen" },
302{ "Category:","Category:" }, 302{ "Category:","Category:" },
303{ "Text1 (Description):","Text1 (Beschreibung):" }, 303{ "Text1 (Description):","Text1 (Beschreibung):" },
304{ "Text2 (Username):","Text2 (Benutzername):" }, 304{ "Text2 (Username):","Text2 (Benutzername):" },
305{ "Text3 (Password):","Text3 (Passwort):" }, 305{ "Text3 (Password):","Text3 (Passwort):" },
306{ "edit/add a password entry","Ändere/hinzufüge Passwort Eintrag" }, 306{ "edit/add a password entry","Ändere/hinzufüge Passwort Eintrag" },
307{ "Description:","Beschreibung:" }, 307{ "Description:","Beschreibung:" },
308{ "Username:","Benutzername:" }, 308{ "Username:","Benutzername:" },
309{ "Password:","Passwort:" }, 309{ "Password:","Passwort:" },
310{ "&Reveal","&Offen zeigen" }, 310{ "&Reveal","&Offen zeigen" },
311{ "&Generate","&Generiere" }, 311{ "&Generate","&Generiere" },
312{ "&Password","&Passwort" }, 312{ "&Password","&Passwort" },
313{ "&Comments","Kommentar" }, 313{ "&Comments","Kommentar" },
314{ "Launcher:","Launcher:" }, 314{ "Launcher:","Launcher:" },
315{ "$d = Description","$d = Beschreibung" }, 315{ "$d = Description","$d = Beschreibung" },
316{ "$n = Username","$n = Benutzername" }, 316{ "$n = Username","$n = Benutzername" },
317{ "$c = Comment","$c = Kommentar" }, 317{ "$c = Comment","$c = Kommentar" },
318{ "$u = URL","$u = URL" }, 318{ "$u = URL","$u = URL" },
319{ "$p = Password","$p = Passwort" }, 319{ "$p = Password","$p = Passwort" },
320{ "&Launcher","&Launcher" }, 320{ "&Launcher","&Launcher" },
321{ "Password generator","Passwort Generator" }, 321{ "Password generator","Passwort Generator" },
322{ "Character set:","Buchstaben Set:" }, 322{ "Character set:","Buchstaben Set:" },
323{ "Lowercase (abc)","Klein (abc)" }, 323{ "Lowercase (abc)","Klein (abc)" },
324{ "Uppercase (ABC)","Groß (ABC)" }, 324{ "Uppercase (ABC)","Groß (ABC)" },
325{ "Numbers (123)","Nummmern (123)" }, 325{ "Numbers (123)","Nummmern (123)" },
326{ "Special characters:","Spezielle Buchstaben:" }, 326{ "Special characters:","Spezielle Buchstaben:" },
327{ "Spaces (blank characters)","Leerzeichen" }, 327{ "Spaces (blank characters)","Leerzeichen" },
328{ "User defined:","Benutzer definiert:" }, 328{ "User defined:","Benutzer definiert:" },
329{ "Password Length:","Passwort Länge:" }, 329{ "Password Length:","Passwort Länge:" },
330{ "Enable Filtering to get better passwords","Enable Filtering to get better passwords" }, 330{ "Enable Filtering to get better passwords","Enable Filtering to get better passwords" },
331{ "no password","Kein Passwort" }, 331{ "no password","Kein Passwort" },
332{ "Sorry, you haven't set a password.","Sorry, Sie haben kein Passwort angegeben." }, 332{ "Sorry, you haven't set a password.","Sorry, Sie haben kein Passwort angegeben." },
333{ "not saved, yet","not saved, yet" }, 333{ "not saved, yet","not saved, yet" },
334{ "Can't deep-lock, because the document\nhasn't been saved, yet. Please save\nto a file and try again.","Kann nicht tiefsperren, weil das\nDokument noch nicht gespeichert wurde.\nBitte speichern und noch einmal versuchen." }, 334{ "Can't deep-lock, because the document\nhasn't been saved, yet. Please save\nto a file and try again.","Kann nicht tiefsperren, weil das\nDokument noch nicht gespeichert wurde.\nBitte speichern und noch einmal versuchen." },
335{ "Find","Finde" }, 335{ "Find","Finde" },
336{ "&Exact match","Genaue Übereinstimmung" }, 336{ "&Exact match","Genaue Übereinstimmung" },
337{ "&Case sensitive","Großschrift abhängig" }, 337{ "&Case sensitive","Großschrift abhängig" },
338{ "Search in Column","Suche in Spalten" }, 338{ "Search in Column","Suche in Spalten" },
339{ "&Description","Beschreibung" }, 339{ "&Description","Beschreibung" },
340{ "C&omment","Kommentar" }, 340{ "C&omment","Kommentar" },
341{ "&Username","Benutzername" }, 341{ "&Username","Benutzername" },
342{ "U&RL","URL" }, 342{ "U&RL","URL" },
343{ "delete?","Löschen?" }, 343{ "delete?","Löschen?" },
344{ "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" }, 344{ "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" },
345{ "Save?","Speichern?" }, 345{ "Save?","Speichern?" },
346{ ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" }, 346{ ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" },
347{ "The list\n "","Die Liste\n "" }, 347{ "The list\n "","Die Liste\n "" },
348{ "nothing to do","Nichts zu tun" }, 348{ "nothing to do","Nichts zu tun" },
349{ "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, 349{ "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." },
350{ "Add new password","Passwort hinzufügen" }, 350{ "Add new password","Passwort hinzufügen" },
351{ "Successfully saved data.","Datei gespeichert." }, 351{ "Successfully saved data.","Datei gespeichert." },
352{ "Category:","Kategorie:" }, 352{ "Category:","Kategorie:" },
353{ "LOCKED","GESPERRT" }, 353{ "LOCKED","GESPERRT" },
354{ "Colors","Farben" }, 354{ "Colors","Farben" },
355{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, 355{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
356{ "Backup enabled","Backup angeschaltet" }, 356{ "Backup enabled","Backup angeschaltet" },
357{ "Use standard backup dir","Standard Backupverzeichnis" }, 357{ "Use standard backup dir","Standard Backupverzeichnis" },
358{ "Number of Backups:","Anzahl der Backups" }, 358{ "Number of Backups:","Anzahl der Backups" },
359{ "Make backup every ","Mache ein Backup alle " }, 359{ "Make backup every ","Mache ein Backup alle " },
360{ " days"," Tage" }, 360{ " days"," Tage" },
361{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, 361{ "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." },
362{ "Backup Failed!","Backup Problem!" }, 362{ "Backup Failed!","Backup Problem!" },
363{ "Try again now","Versuche jetzt nochmal" }, 363{ "Try again now","Versuche jetzt nochmal" },
364{ "Try again later","Versuche später nochmal" }, 364{ "Try again later","Versuche später nochmal" },
365{ "Try again tomorrow","Versuche morgen nochmal" }, 365{ "Try again tomorrow","Versuche morgen nochmal" },
366{ "Disable backup","Schalte Backup ab" }, 366{ "Disable backup","Schalte Backup ab" },
367{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, 367{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },
368{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, 368{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
369{ "Choose action","Wähle Aktion" }, 369{ "Choose action","Wähle Aktion" },
370{ "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." }, 370{ "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." },
371{ "Global Settings...","Globale Einstellungen..." }, 371{ "Global Settings...","Globale Einstellungen..." },
372{ "","" }, 372{ " sec"," Sek" },
373{ "","" }, 373{ "","" },
374{ "","" }, 374{ "","" },
375{ "","" }, 375{ "","" },
376{ "","" }, 376{ "","" },
377{ "","" }, 377{ "","" },
378 378
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
@@ -113,198 +113,203 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
113 QLabel* kcfg_crypt_label = new QLabel(i18n("Encryption:"), filePage); 113 QLabel* kcfg_crypt_label = new QLabel(i18n("Encryption:"), filePage);
114 fileLayout->addWidget(kcfg_crypt_label,i,0); 114 fileLayout->addWidget(kcfg_crypt_label,i,0);
115 kcfg_cryptAlgo = new QComboBox(filePage, "kcfg_cryptAlgo"); 115 kcfg_cryptAlgo = new QComboBox(filePage, "kcfg_cryptAlgo");
116 kcfg_cryptAlgo->insertItem(i18n("Blowfish (128 bit)")); 116 kcfg_cryptAlgo->insertItem(i18n("Blowfish (128 bit)"));
117#ifdef CONFIG_PWMANAGER_GCRY 117#ifdef CONFIG_PWMANAGER_GCRY
118 kcfg_cryptAlgo->insertItem(i18n("AES-128, Rijndael (128 bit)")); 118 kcfg_cryptAlgo->insertItem(i18n("AES-128, Rijndael (128 bit)"));
119 kcfg_cryptAlgo->insertItem(i18n("AES-192, Rijndael (192 bit)")); 119 kcfg_cryptAlgo->insertItem(i18n("AES-192, Rijndael (192 bit)"));
120 kcfg_cryptAlgo->insertItem(i18n("AES-256, Rijndael (256 bit)")); 120 kcfg_cryptAlgo->insertItem(i18n("AES-256, Rijndael (256 bit)"));
121 kcfg_cryptAlgo->insertItem(i18n("Triple-DES (168 bit)")); 121 kcfg_cryptAlgo->insertItem(i18n("Triple-DES (168 bit)"));
122 kcfg_cryptAlgo->insertItem(i18n("Twofish (256 bit)")); 122 kcfg_cryptAlgo->insertItem(i18n("Twofish (256 bit)"));
123 kcfg_cryptAlgo->insertItem(i18n("Twofish-128 (128 bit)")); 123 kcfg_cryptAlgo->insertItem(i18n("Twofish-128 (128 bit)"));
124#endif // CONFIG_PWMANAGER_GCRY 124#endif // CONFIG_PWMANAGER_GCRY
125 fileLayout->addWidget( kcfg_cryptAlgo,i,1); 125 fileLayout->addWidget( kcfg_cryptAlgo,i,1);
126 ++i; 126 ++i;
127 127
128 QLabel* kcfg_hash_label = new QLabel(i18n("Hashing:"), filePage); 128 QLabel* kcfg_hash_label = new QLabel(i18n("Hashing:"), filePage);
129 fileLayout->addWidget(kcfg_hash_label,i,0); 129 fileLayout->addWidget(kcfg_hash_label,i,0);
130 kcfg_hashAlgo = new QComboBox(filePage, "kcfg_hashAlgo"); 130 kcfg_hashAlgo = new QComboBox(filePage, "kcfg_hashAlgo");
131 kcfg_hashAlgo->insertItem(i18n("SHA-160, SHA1 (160 bit)")); 131 kcfg_hashAlgo->insertItem(i18n("SHA-160, SHA1 (160 bit)"));
132#ifdef CONFIG_PWMANAGER_GCRY 132#ifdef CONFIG_PWMANAGER_GCRY
133 kcfg_hashAlgo->insertItem(i18n("SHA-256 (256 bit)")); 133 kcfg_hashAlgo->insertItem(i18n("SHA-256 (256 bit)"));
134 kcfg_hashAlgo->insertItem(i18n("SHA-384 (384 bit)")); 134 kcfg_hashAlgo->insertItem(i18n("SHA-384 (384 bit)"));
135 kcfg_hashAlgo->insertItem(i18n("SHA-512 (512 bit)")); 135 kcfg_hashAlgo->insertItem(i18n("SHA-512 (512 bit)"));
136 kcfg_hashAlgo->insertItem(i18n("MD5 (128 bit)")); 136 kcfg_hashAlgo->insertItem(i18n("MD5 (128 bit)"));
137 kcfg_hashAlgo->insertItem(i18n("RIPE-MD-160 (160 bit)")); 137 kcfg_hashAlgo->insertItem(i18n("RIPE-MD-160 (160 bit)"));
138 kcfg_hashAlgo->insertItem(i18n("Tiger (192 bit)")); 138 kcfg_hashAlgo->insertItem(i18n("Tiger (192 bit)"));
139#endif // CONFIG_PWMANAGER_GCRY 139#endif // CONFIG_PWMANAGER_GCRY
140 fileLayout->addWidget( kcfg_hashAlgo,i,1); 140 fileLayout->addWidget( kcfg_hashAlgo,i,1);
141 ++i; 141 ++i;
142 142
143 permissionLineEdit = new QLineEdit(filePage); 143 permissionLineEdit = new QLineEdit(filePage);
144 QLabel* permissionLineLabel = new QLabel(permissionLineEdit, i18n("Permissions:"), filePage); 144 QLabel* permissionLineLabel = new QLabel(permissionLineEdit, i18n("Permissions:"), filePage);
145 fileLayout->addWidget(permissionLineLabel,i,0); 145 fileLayout->addWidget(permissionLineLabel,i,0);
146 fileLayout->addWidget(permissionLineEdit,i,1); 146 fileLayout->addWidget(permissionLineEdit,i,1);
147 ++i; 147 ++i;
148 148
149 KPrefsWidBool *sb = addWidBool(i18n("Make backup before saving"), 149 KPrefsWidBool *sb = addWidBool(i18n("Make backup before saving"),
150 &(prefs->mMakeFileBackup),filePage); 150 &(prefs->mMakeFileBackup),filePage);
151 fileLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 151 fileLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
152 ++i; 152 ++i;
153 153
154 // Timeout page 154 // Timeout page
155 ////////////////////////////////////////////////////// 155 //////////////////////////////////////////////////////
156 QWidget *timeoutPage = new QWidget( this ); 156 QWidget *timeoutPage = new QWidget( this );
157 QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2); 157 QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2);
158 158
159 i = 0; 159 i = 0;
160 pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" ); 160 pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" );
161 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); 161 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);
162 timeoutLayout->addMultiCellWidget(timeoutLabel,i, i, 0 ,0); 162 timeoutLayout->addMultiCellWidget(timeoutLabel, i, i, 0 ,1);
163 timeoutLayout->addWidget(pwTimeoutSpinBox,i,1);
164 ++i; 163 ++i;
165 164 timeoutLayout->addMultiCellWidget(pwTimeoutSpinBox,i,i,0,1);
165 ++i;
166 pwTimeoutSpinBox->setSuffix ( i18n(" sec") );
166 lockTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "lockTimeoutSpinBox" ); 167 lockTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "lockTimeoutSpinBox" );
167 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); 168 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);
168 timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,0); 169 timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,1);
169 timeoutLayout->addWidget(lockTimeoutSpinBox,i,1); 170 ++i;
171 timeoutLayout->addMultiCellWidget(lockTimeoutSpinBox,i,i,0,1);
172 lockTimeoutSpinBox->setSuffix ( i18n(" sec") );
170 ++i; 173 ++i;
171 174
172 sb = addWidBool(i18n("deep-lock on autolock"), 175 sb = addWidBool(i18n("deep-lock on autolock"),
173 &(prefs->mAutoDeeplock),timeoutPage); 176 &(prefs->mAutoDeeplock),timeoutPage);
174 timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 177 timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
175 ++i; 178 ++i;
176 179 sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),timeoutPage);
180 timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
181 ++i;
177 182
178 // Autostart page 183 // Autostart page
179 ////////////////////////////////////////////////////// 184 //////////////////////////////////////////////////////
180 QWidget *autostartPage = new QWidget( this ); 185 QWidget *autostartPage = new QWidget( this );
181 QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2); 186 QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2);
182 187
183 i = 0; 188 i = 0;
184 189
185 autostartLineEdit = new KURLRequester(autostartPage, "autoStartLineEdit"); 190 autostartLineEdit = new KURLRequester(autostartPage, "autoStartLineEdit");
186 QLabel* autostartLineLabel = new QLabel(autostartLineEdit, "Open this file automatically on startup:",autostartPage); 191 QLabel* autostartLineLabel = new QLabel(autostartLineEdit, "Open this file automatically on startup:",autostartPage);
187 autostartLayout->addMultiCellWidget(autostartLineLabel,i,i,0,1); 192 autostartLayout->addMultiCellWidget(autostartLineLabel,i,i,0,1);
188 ++i; 193 ++i;
189 autostartLayout->addMultiCellWidget(autostartLineEdit,i,i,0,1); 194 autostartLayout->addMultiCellWidget(autostartLineEdit,i,i,0,1);
190 ++i; 195 ++i;
191 196
192 sb = addWidBool(i18n("open deeplocked"), 197 sb = addWidBool(i18n("open deeplocked"),
193 &(prefs->mAutostartDeeplocked),autostartPage); 198 &(prefs->mAutostartDeeplocked),autostartPage);
194 autostartLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 199 autostartLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
195 ++i; 200 ++i;
196 201
197 202
198 // external app page 203 // external app page
199 ////////////////////////////////////////////////////// 204 //////////////////////////////////////////////////////
200 QWidget *externalappPage = new QWidget( this ); 205 QWidget *externalappPage = new QWidget( this );
201 QGridLayout *externalappLayout = new QGridLayout( externalappPage, 3, 2); 206 QGridLayout *externalappLayout = new QGridLayout( externalappPage, 3, 2);
202 207
203 i = 0; 208 i = 0;
204 209
205 browserLineEdit = new QLineEdit(externalappPage); 210 browserLineEdit = new QLineEdit(externalappPage);
206 QLabel* browserLineLabel = new QLabel(browserLineEdit, i18n("Favourite browser:"), externalappPage); 211 QLabel* browserLineLabel = new QLabel(browserLineEdit, i18n("Favourite browser:"), externalappPage);
207 externalappLayout->addWidget(browserLineLabel,i,0); 212 externalappLayout->addWidget(browserLineLabel,i,0);
208 externalappLayout->addWidget(browserLineEdit,i,1); 213 externalappLayout->addWidget(browserLineEdit,i,1);
209 ++i; 214 ++i;
210 215
211 xtermLineEdit = new QLineEdit(externalappPage); 216 xtermLineEdit = new QLineEdit(externalappPage);
212 QLabel* xtermLineLabel = new QLabel(xtermLineEdit, i18n("Favourite x-terminal:"), externalappPage); 217 QLabel* xtermLineLabel = new QLabel(xtermLineEdit, i18n("Favourite x-terminal:"), externalappPage);
213 externalappLayout->addWidget(xtermLineLabel,i,0); 218 externalappLayout->addWidget(xtermLineLabel,i,0);
214 externalappLayout->addWidget(xtermLineEdit,i,1); 219 externalappLayout->addWidget(xtermLineEdit,i,1);
215 ++i; 220 ++i;
216 221
217 222#if 0
218 // miscelaneous page 223 // miscelaneous page
219 ////////////////////////////////////////////////////// 224 //////////////////////////////////////////////////////
220 QWidget *miscPage = new QWidget( this ); 225 QWidget *miscPage = new QWidget( this );
221 QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2); 226 QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2);
222 227
223 i = 0; 228 i = 0;
224 229
225 /*US ENH: PWM/Pi has no tray and con be minimized 230 /*US ENH: PWM/Pi has no tray and con be minimized
226 sb = addWidBool(i18n("Show icon in system-tray"),&(prefs->mTray),miscPage); 231 sb = addWidBool(i18n("Show icon in system-tray"),&(prefs->mTray),miscPage);
227 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 232 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
228 ++i; 233 ++i;
229 */ 234 */
230 235
231 sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),miscPage); 236 sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),miscPage);
232 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 237 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
233 ++i; 238 ++i;
234 239
235 /*US ENH: PWM/Pi has no tray and con be minimized 240 /*US ENH: PWM/Pi has no tray and con be minimized
236 sb = addWidBool(i18n("auto-minimize to tray on startup"),&(prefs->mAutoMinimizeOnStart),miscPage); 241 sb = addWidBool(i18n("auto-minimize to tray on startup"),&(prefs->mAutoMinimizeOnStart),miscPage);
237 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 242 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
238 ++i; 243 ++i;
239 244
240 KPrefsWidRadios * minimizeRadio = addWidRadios(i18n("auto-lock on minimize:") ,&(prefs->mMinimizeLock), miscPage); 245 KPrefsWidRadios * minimizeRadio = addWidRadios(i18n("auto-lock on minimize:") ,&(prefs->mMinimizeLock), miscPage);
241 minimizeRadio->addRadio(i18n("don't lock")); 246 minimizeRadio->addRadio(i18n("don't lock"));
242 minimizeRadio->addRadio(i18n("normal lock")); 247 minimizeRadio->addRadio(i18n("normal lock"));
243 minimizeRadio->addRadio(i18n("deep-lock")); 248 minimizeRadio->addRadio(i18n("deep-lock"));
244 miscLayout->addMultiCellWidget( (QWidget*)minimizeRadio->groupBox(),i,i,0,2); 249 miscLayout->addMultiCellWidget( (QWidget*)minimizeRadio->groupBox(),i,i,0,2);
245 ++i; 250 ++i;
246 251
247 sb = addWidBool(i18n("KWallet emulation"),&(prefs->mKWalletEmu),miscPage); 252 sb = addWidBool(i18n("KWallet emulation"),&(prefs->mKWalletEmu),miscPage);
248 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 253 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
249 ++i; 254 ++i;
250 255
251 sb = addWidBool(i18n("Close instead Minimize into tray"),&(prefs->mClose),miscPage); 256 sb = addWidBool(i18n("Close instead Minimize into tray"),&(prefs->mClose),miscPage);
252 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); 257 miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
253 ++i; 258 ++i;
254 */ 259 */
255 260#endif
256 261
257 tabWidget->addTab( windowStylePage, i18n( "Look && feel" ) ); 262 tabWidget->addTab( windowStylePage, i18n( "Look && feel" ) );
258 tabWidget->addTab( filePage, i18n( "File" ) ); 263 tabWidget->addTab( filePage, i18n( "File" ) );
259 tabWidget->addTab( timeoutPage, i18n( "Timeout" ) ); 264 tabWidget->addTab( timeoutPage, i18n( "Timeout" ) );
260 tabWidget->addTab( autostartPage, i18n( "Autostart" ) ); 265 tabWidget->addTab( autostartPage, i18n( "Autostart" ) );
261 tabWidget->addTab( externalappPage, i18n( "External apps" ) ); 266 tabWidget->addTab( externalappPage, i18n( "External apps" ) );
262 tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) ); 267 //tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) );
263 268
264 269
265 connect( permissionLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); 270 connect( permissionLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
266 connect( pwTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) ); 271 connect( pwTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) );
267 connect( lockTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) ); 272 connect( lockTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) );
268 connect( autostartLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); 273 connect( autostartLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
269 connect( browserLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); 274 connect( browserLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
270 connect( xtermLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); 275 connect( xtermLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
271 276
272} 277}
273 278
274 279
275void PWMConfigWidget::usrReadConfig() 280void PWMConfigWidget::usrReadConfig()
276{ 281{
277 PWMPrefs* prefs = PWMPrefs::instance(); 282 PWMPrefs* prefs = PWMPrefs::instance();
278 283
279 284
280 setFilePermissions(prefs->mFilePermissions); 285 setFilePermissions(prefs->mFilePermissions);
281 286
282 pwTimeoutSpinBox->setValue(prefs->mPwTimeout); 287 pwTimeoutSpinBox->setValue(prefs->mPwTimeout);
283 lockTimeoutSpinBox->setValue(prefs->mLockTimeout); 288 lockTimeoutSpinBox->setValue(prefs->mLockTimeout);
284 autostartLineEdit->setURL(prefs->mAutoStart); 289 autostartLineEdit->setURL(prefs->mAutoStart);
285 browserLineEdit->setText(prefs->mBrowserCommand); 290 browserLineEdit->setText(prefs->mBrowserCommand);
286 xtermLineEdit->setText(prefs->mXTermCommand); 291 xtermLineEdit->setText(prefs->mXTermCommand);
287 292
288 kcfg_compression->setCurrentItem(prefs->mCompression); 293 kcfg_compression->setCurrentItem(prefs->mCompression);
289 kcfg_cryptAlgo->setCurrentItem(prefs->mCryptAlgo); 294 kcfg_cryptAlgo->setCurrentItem(prefs->mCryptAlgo);
290 kcfg_hashAlgo->setCurrentItem(prefs->mHashAlgo); 295 kcfg_hashAlgo->setCurrentItem(prefs->mHashAlgo);
291} 296}
292 297
293void PWMConfigWidget::usrWriteConfig() 298void PWMConfigWidget::usrWriteConfig()
294{ 299{
295 PWMPrefs* prefs = PWMPrefs::instance(); 300 PWMPrefs* prefs = PWMPrefs::instance();
296 301
297 prefs->mFilePermissions = getFilePermissions(); 302 prefs->mFilePermissions = getFilePermissions();
298 303
299 prefs->mPwTimeout = pwTimeoutSpinBox->value(); 304 prefs->mPwTimeout = pwTimeoutSpinBox->value();
300 prefs->mLockTimeout = lockTimeoutSpinBox->value(); 305 prefs->mLockTimeout = lockTimeoutSpinBox->value();
301 prefs->mAutoStart = autostartLineEdit->url(); 306 prefs->mAutoStart = autostartLineEdit->url();
302 307
303 prefs->mBrowserCommand = browserLineEdit->text(); 308 prefs->mBrowserCommand = browserLineEdit->text();
304 prefs->mXTermCommand = xtermLineEdit->text(); 309 prefs->mXTermCommand = xtermLineEdit->text();
305 310
306 prefs->mCompression = kcfg_compression->currentItem(); 311 prefs->mCompression = kcfg_compression->currentItem();
307 prefs->mCryptAlgo = kcfg_cryptAlgo->currentItem(); 312 prefs->mCryptAlgo = kcfg_cryptAlgo->currentItem();
308 prefs->mHashAlgo = kcfg_hashAlgo->currentItem(); 313 prefs->mHashAlgo = kcfg_hashAlgo->currentItem();
309 314
310} 315}