-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index ccc9d83..2650e28 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -305,52 +305,56 @@ | |||
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" }, | ||
354 | { "","" }, | ||
355 | { "","" }, | ||
356 | { "","" }, | ||
353 | { "","" }, | 357 | { "","" }, |
354 | { "","" }, | 358 | { "","" }, |
355 | { "","" }, | 359 | { "","" }, |
356 | 360 | ||
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index 6fbe110..61f2616 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp | |||
@@ -1245,97 +1245,97 @@ PwMerror PwMDoc::getCommentByLvp(const QString &category, int listViewPos, | |||
1245 | string *foundComment) | 1245 | string *foundComment) |
1246 | { | 1246 | { |
1247 | PWM_ASSERT(foundComment); | 1247 | PWM_ASSERT(foundComment); |
1248 | unsigned int cat = 0; | 1248 | unsigned int cat = 0; |
1249 | 1249 | ||
1250 | if (!findCategory(category, &cat)) | 1250 | if (!findCategory(category, &cat)) |
1251 | return e_invalidArg; | 1251 | return e_invalidArg; |
1252 | 1252 | ||
1253 | unsigned int i, entries = numEntries(cat); | 1253 | unsigned int i, entries = numEntries(cat); |
1254 | for (i = 0; i < entries; ++i) { | 1254 | for (i = 0; i < entries; ++i) { |
1255 | if (dti.dta[cat].d[i].listViewPos == listViewPos) { | 1255 | if (dti.dta[cat].d[i].listViewPos == listViewPos) { |
1256 | *foundComment = dti.dta[cat].d[i].comment; | 1256 | *foundComment = dti.dta[cat].d[i].comment; |
1257 | if (dti.dta[cat].d[i].binary) | 1257 | if (dti.dta[cat].d[i].binary) |
1258 | return e_binEntry; | 1258 | return e_binEntry; |
1259 | return e_normalEntry; | 1259 | return e_normalEntry; |
1260 | } | 1260 | } |
1261 | } | 1261 | } |
1262 | BUG(); | 1262 | BUG(); |
1263 | return e_generic; | 1263 | return e_generic; |
1264 | } | 1264 | } |
1265 | 1265 | ||
1266 | PwMerror PwMDoc::getCommentByLvp_long(const QString &category, int listViewPos, | 1266 | PwMerror PwMDoc::getCommentByLvp_long(const QString &category, int listViewPos, |
1267 | string *foundComment) | 1267 | string *foundComment) |
1268 | { | 1268 | { |
1269 | PWM_ASSERT(foundComment); | 1269 | PWM_ASSERT(foundComment); |
1270 | unsigned int cat = 0; | 1270 | unsigned int cat = 0; |
1271 | 1271 | ||
1272 | if (!findCategory(category, &cat)) | 1272 | if (!findCategory(category, &cat)) |
1273 | return e_invalidArg; | 1273 | return e_invalidArg; |
1274 | 1274 | ||
1275 | unsigned int i, entries = numEntries(cat); | 1275 | unsigned int i, entries = numEntries(cat); |
1276 | for (i = 0; i < entries; ++i) { | 1276 | for (i = 0; i < entries; ++i) { |
1277 | if (dti.dta[cat].d[i].listViewPos == listViewPos) { | 1277 | if (dti.dta[cat].d[i].listViewPos == listViewPos) { |
1278 | if (dti.dta[cat].d[i].binary) | 1278 | if (dti.dta[cat].d[i].binary) |
1279 | return e_binEntry; | 1279 | return e_binEntry; |
1280 | PwMCategoryItem* catItem = getCategoryEntry(cat); | 1280 | PwMCategoryItem* catItem = getCategoryEntry(cat); |
1281 | QString retval; | 1281 | QString retval; |
1282 | QString tempval = QString (dti.dta[cat].d[i].desc.c_str()); | 1282 | QString tempval = QString (dti.dta[cat].d[i].desc.c_str()); |
1283 | if ( !tempval.isEmpty() ) { | 1283 | if ( !tempval.isEmpty() ) { |
1284 | retval += "<b>" +QString ( catItem->desc_text.c_str() )+ ":</b> "+ tempval+"<br>" ; | 1284 | retval += "<b>" +QString ( catItem->desc_text.c_str() )+ ":</b> "+ tempval+"<br>" ; |
1285 | } | 1285 | } |
1286 | tempval = QString (dti.dta[cat].d[i].name.c_str()); | 1286 | tempval = QString (dti.dta[cat].d[i].name.c_str()); |
1287 | if ( !tempval.isEmpty() ) { | 1287 | if ( !tempval.isEmpty() ) { |
1288 | retval += "<b>" +QString ( catItem->name_text.c_str() ) + ":</b> "+ tempval+"<br>" ; | 1288 | retval += "<b>" +QString ( catItem->name_text.c_str() ) + ":</b> "+ tempval+"<br>" ; |
1289 | } | 1289 | } |
1290 | tempval = QString (dti.dta[cat].d[i].pw.c_str()); | 1290 | tempval = QString (dti.dta[cat].d[i].pw.c_str()); |
1291 | if ( !tempval.isEmpty() ) { | 1291 | if ( !tempval.isEmpty() ) { |
1292 | if ( dti.dta[cat].d[i].lockStat ) | 1292 | if ( dti.dta[cat].d[i].lockStat ) |
1293 | retval += "<b>" +QString ( catItem->pw_text.c_str() )+ ":</b> " + i18n("<LOCKED>") +"<br>" ; | 1293 | retval += "<b>" +QString ( catItem->pw_text.c_str() )+ ": " + i18n("LOCKED") +"</b><br>" ; |
1294 | else | 1294 | else |
1295 | retval += "<b>" +QString ( catItem->pw_text.c_str() )+ ":</b> " + tempval+"<br>" ; | 1295 | retval += "<b>" +QString ( catItem->pw_text.c_str() )+ ":</b> " + tempval+"<br>" ; |
1296 | } | 1296 | } |
1297 | tempval = QString (dti.dta[cat].d[i].url.c_str()); | 1297 | tempval = QString (dti.dta[cat].d[i].url.c_str()); |
1298 | if ( !tempval.isEmpty() ) { | 1298 | if ( !tempval.isEmpty() ) { |
1299 | retval += "<b>" +i18n("URL:")+ "</b> " + tempval+"<br>" ; | 1299 | retval += "<b>" +i18n("URL:")+ "</b> " + tempval+"<br>" ; |
1300 | } | 1300 | } |
1301 | tempval = QString (dti.dta[cat].d[i].launcher.c_str()); | 1301 | tempval = QString (dti.dta[cat].d[i].launcher.c_str()); |
1302 | if ( !tempval.isEmpty() ) { | 1302 | if ( !tempval.isEmpty() ) { |
1303 | retval += "<b>" +i18n("Launcher:")+ "</b> " + tempval+"<br>" ; | 1303 | retval += "<b>" +i18n("Launcher:")+ "</b> " + tempval+"<br>" ; |
1304 | } | 1304 | } |
1305 | tempval = QString (dti.dta[cat].d[i].comment.c_str()); | 1305 | tempval = QString (dti.dta[cat].d[i].comment.c_str()); |
1306 | if ( !tempval.isEmpty() ) { | 1306 | if ( !tempval.isEmpty() ) { |
1307 | tempval.replace(QRegExp ( "\n" ), "<br>" ); | 1307 | tempval.replace(QRegExp ( "\n" ), "<br>" ); |
1308 | retval += "<b>" +i18n("Comment:")+ "</b><br>" + tempval+"<br>" ; | 1308 | retval += "<b>" +i18n("Comment:")+ "</b><br>" + tempval+"<br>" ; |
1309 | } | 1309 | } |
1310 | 1310 | ||
1311 | string ret ( retval.latin1() ); | 1311 | string ret ( retval.latin1() ); |
1312 | 1312 | ||
1313 | 1313 | ||
1314 | // *foundComment = dti.dta[cat].d[i].comment; | 1314 | // *foundComment = dti.dta[cat].d[i].comment; |
1315 | *foundComment = ret; | 1315 | *foundComment = ret; |
1316 | return e_normalEntry; | 1316 | return e_normalEntry; |
1317 | } | 1317 | } |
1318 | } | 1318 | } |
1319 | BUG(); | 1319 | BUG(); |
1320 | return e_generic; | 1320 | return e_generic; |
1321 | } | 1321 | } |
1322 | 1322 | ||
1323 | bool PwMDoc::compressDta(string *d, char algo) | 1323 | bool PwMDoc::compressDta(string *d, char algo) |
1324 | { | 1324 | { |
1325 | PWM_ASSERT(d); | 1325 | PWM_ASSERT(d); |
1326 | switch (algo) { | 1326 | switch (algo) { |
1327 | case PWM_COMPRESS_GZIP: { | 1327 | case PWM_COMPRESS_GZIP: { |
1328 | CompressGzip comp; | 1328 | CompressGzip comp; |
1329 | return comp.compress(d); | 1329 | return comp.compress(d); |
1330 | } | 1330 | } |
1331 | #ifndef PWM_EMBEDDED | 1331 | #ifndef PWM_EMBEDDED |
1332 | case PWM_COMPRESS_BZIP2: { | 1332 | case PWM_COMPRESS_BZIP2: { |
1333 | CompressBzip2 comp; | 1333 | CompressBzip2 comp; |
1334 | return comp.compress(d); | 1334 | return comp.compress(d); |
1335 | } | 1335 | } |
1336 | #endif | 1336 | #endif |
1337 | case PWM_COMPRESS_NONE: { | 1337 | case PWM_COMPRESS_NONE: { |
1338 | return true; | 1338 | return true; |
1339 | } default: { | 1339 | } default: { |
1340 | BUG(); | 1340 | BUG(); |
1341 | } | 1341 | } |