summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--pwmanager/pwmanager/pwm.cpp30
-rw-r--r--pwmanager/pwmanager/pwmdoc.cpp25
2 files changed, 27 insertions, 28 deletions
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index c511661..66d26d6 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -727,6 +727,6 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
KMessageBox::error(this,
i18n("Couldn't edit the entry.\n"
- "Maybe you changed the category and "
- "this entry is already present in the new "
+ "Maybe you changed the category and\n"
+ "this entry is already present\nin the new "
"category?"),
i18n("couldn't edit entry."));
@@ -916,5 +916,5 @@ void PwM::exportToText()
KMessageBox::error(this,
i18n("Error: Couldn't write to file.\n"
- "Please check if you have permission to write "
+ "Please check if you have permission to write\n"
"to the file in that directory."),
i18n("error while writing"));
@@ -928,7 +928,7 @@ bool PwM::importFromText()
if (!isVirgin()) {
if (KMessageBox::questionYesNo(this,
- i18n("Do you want to import the data "
- "into the current document? (If you "
- "select \"no\", a new document will be "
+ i18n("Do you want to import the data\n"
+ "into the current document? (If you\n"
+ "select \"no\", a new document will be\n"
"opened.)"),
i18n("import into this document?"))
@@ -957,5 +957,5 @@ bool PwM::importFromText()
KMessageBox::error(this,
i18n("Could not read file-format.\n"
- "This seems to be _not_ a valid file "
+ "This seems to be _not_ a valid file\n"
"exported by PwM."),
i18n("invalid file-format"));
@@ -967,5 +967,5 @@ bool PwM::importFromText()
KMessageBox::error(this,
i18n("Could not import file!\n"
- "Do you have permission to read this file? "
+ "Do you have permission to read this file?\n"
"Do you have enough free memory?"),
i18n("import failed"));
@@ -1050,7 +1050,7 @@ bool PwM::importFromGpasman()
if (!isVirgin()) {
if (KMessageBox::questionYesNo(this,
- i18n("Do you want to import the data "
- "into the current document? (If you "
- "select \"no\", a new document will be "
+ i18n("Do you want to import the data\n"
+ "into the current document? (If you\n"
+ "select \"no\", a new document will be\n"
"opened.)"),
i18n("import into this document?"))
@@ -1077,9 +1077,9 @@ bool PwM::importFromGpasman()
if (KMessageBox::questionYesNo(this,
i18n
- ("This is probably the wrong master-password"
+ ("This is probably the wrong master-password\n"
"you have typed in.\n"
- "There is no real way to determine the "
- "correctness of the password in the Gpasman "
- "file-format. But I think this "
+ "There is no real way to determine the\n"
+ "correctness of the password in the Gpasman\n"
+ "file-format. But I think this\n"
"password ist wrong.\n"
"Do you want to continue nevertheless?"),
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 8869f3a..86b6273 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -1265,9 +1265,12 @@ bool PwMDoc::compressDta(string *d, char algo)
CompressGzip comp;
return comp.compress(d);
- /*US } case PWM_COMPRESS_BZIP2: {
+ }
+#ifndef PWM_EMBEDDED
+ case PWM_COMPRESS_BZIP2: {
CompressBzip2 comp;
return comp.compress(d);
-*/
- } case PWM_COMPRESS_NONE: {
+ }
+#endif
+ case PWM_COMPRESS_NONE: {
return true;
} default: {
@@ -1285,9 +1288,12 @@ bool PwMDoc::decompressDta(string *d, char algo)
CompressGzip comp;
return comp.decompress(d);
- /*US } case PWM_COMPRESS_BZIP2: {
+ }
+#ifndef PWM_EMBEDDED
+ case PWM_COMPRESS_BZIP2: {
CompressBzip2 comp;
return comp.decompress(d);
- */
- } case PWM_COMPRESS_NONE: {
+ }
+#endif
+ case PWM_COMPRESS_NONE: {
return true;
}
@@ -3124,6 +3130,4 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
//first check if we have a matching category in the local file
const string* remotecat = syncRemote->getCategory(catRemote);
- //US syncRemote->insertAddressee( inRemote, false );
- //US syncLocal->insertAddressee( inRemote, false );
syncLocal->addEntry(remotecat->c_str(), inRemote, true, false);
@@ -3132,5 +3136,4 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
// pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
syncRemote->delEntry(catRemote, indexRemote, true);
- //USsyncRemote->removeAddressee( inRemote );
++deletedPasswordsRemote;
}
@@ -3164,5 +3167,4 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
// pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
syncLocal->delEntry(catLocal, indexLocal, true);
- //USsyncLocal->removeAddressee( inLocal );
++deletedPasswordsLocal;
} else {
@@ -3174,5 +3176,4 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
const string* localcat = syncLocal->getCategory(catLocal);
- //USsyncLocal->insertAddressee( inLocal, false );
PwMDataItem newEntry;
newEntry = *inLocal;
@@ -3221,6 +3222,4 @@ int PwMDoc::takePwMDataItem( PwMDataItem* local, PwMDataItem* remote, QDateTime
QDateTime remoteMod = remote->meta.update;
- //US QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
-
if ( localMod == remoteMod )
return 0;