summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2016-08-11 15:47:54 (GMT)
committerYuri Chornoivan <yurchor@ukr.net>2016-08-11 15:47:54 (GMT)
commit98fe7602a1e9c5ea570eaa44dd808bf252193aa6 (patch)
tree8b6d6bf06eb14f7f765edecc5c3689166ee8501d
parent6305064e85c2a945f9ed93e2ba2ca2508ce7c679 (diff)
Fix minor typos: and or -> or
-rw-r--r--src/conf/cryptooperationsconfigwidget.cpp4
-rw-r--r--src/kcfg/fileoperationspreferences.kcfg4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/conf/cryptooperationsconfigwidget.cpp b/src/conf/cryptooperationsconfigwidget.cpp
index ff40a35..e20c241 100644
--- a/src/conf/cryptooperationsconfigwidget.cpp
+++ b/src/conf/cryptooperationsconfigwidget.cpp
@@ -84,8 +84,8 @@ void CryptoOperationsConfigWidget::setupGui()
QGroupBox *fileGrp = new QGroupBox(i18n("File Operations"));
QVBoxLayout *fileGrpLay = new QVBoxLayout;
mPGPFileExtCB = new QCheckBox(i18n("Create OpenPGP encrypted files with \".pgp\" file extensions instead of \".gpg\""));
- mASCIIArmorCB = new QCheckBox(i18n("Create signed and or encrypted files as text files."));
- mASCIIArmorCB->setToolTip(i18nc("@info", "Set this option to encode encrypted and or signed files as base64 encoded text. "
+ mASCIIArmorCB = new QCheckBox(i18n("Create signed or encrypted files as text files."));
+ mASCIIArmorCB->setToolTip(i18nc("@info", "Set this option to encode encrypted or signed files as base64 encoded text. "
"So that they can be opened with an editor or sent in a mail body. "
"This will increase file size by one third."));
mAutoDecryptVerifyCB = new QCheckBox(i18n("Automatically start operation based on input detection for decrypt/verify."));
diff --git a/src/kcfg/fileoperationspreferences.kcfg b/src/kcfg/fileoperationspreferences.kcfg
index 11a4779..b32c8ed 100644
--- a/src/kcfg/fileoperationspreferences.kcfg
+++ b/src/kcfg/fileoperationspreferences.kcfg
@@ -22,8 +22,8 @@
<default>tar</default>
</entry>
<entry name="AddASCIIArmor" key="ascii-armor" type="Bool">
- <label>Create signed and or encrypted files as text files.</label>
- <whatsthis>Set this option to encode encrypted and or signed files as base64 encoded text. So that they can be opened with an editor or sent in a mail body. This will increase file size by one third.</whatsthis>
+ <label>Create signed or encrypted files as text files.</label>
+ <whatsthis>Set this option to encode encrypted or signed files as base64 encoded text. So that they can be opened with an editor or sent in a mail body. This will increase file size by one third.</whatsthis>
<default>false</default>
</entry>
</group>