Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

(cherry picked from commit dd568906ff64ebd4a4267801249d3f131aad12a8)

47 files changed, 5412 insertions, 4551 deletions

diff --git a/tde-i18n-ar/messages/tdepim/libkpgp.po b/tde-i18n-ar/messages/tdepim/libkpgp.po
index 997b1418293..7063c342b5c 100644
--- a/tde-i18n-ar/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ar/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-02-11 01:49+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -13,6 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -31,119 +43,119 @@ msgstr ""
 msgid "Out of memory."
 msgstr ""
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr ""
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr ""
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr ""
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr ""
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr ""
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
 "%1"
 msgstr ""
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
 msgstr ""
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr ""
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr ""
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -152,7 +164,7 @@ msgid ""
 "Please re-select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -161,7 +173,7 @@ msgid ""
 "Select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -204,8 +216,8 @@ msgstr ""
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 
 #: kpgpbase2.cpp:213
@@ -244,8 +256,8 @@ msgstr ""
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 
 #: kpgpbase5.cpp:157
@@ -290,7 +302,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr ""
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr ""
 
@@ -304,6 +316,10 @@ msgid ""
 "\"%1\":"
 msgstr ""
 
+#: kpgpui.cpp:117
+msgid "Warning"
+msgstr ""
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -342,22 +358,25 @@ msgstr ""
 msgid "Do not use any encryption tool"
 msgstr ""
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr ""
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:174
@@ -366,11 +385,10 @@ msgstr ""
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:188
@@ -379,11 +397,10 @@ msgstr ""
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:200
@@ -392,11 +409,11 @@ msgstr ""
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
 
 #: kpgpui.cpp:327
@@ -417,9 +434,8 @@ msgstr ""
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:391
@@ -519,6 +535,10 @@ msgstr ""
 msgid "Please select an OpenPGP key to use."
 msgstr ""
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr ""
diff --git a/tde-i18n-bg/messages/tdepim/libkpgp.po b/tde-i18n-bg/messages/tdepim/libkpgp.po
index a5e24f6ac02..b2234f497ea 100644
--- a/tde-i18n-bg/messages/tdepim/libkpgp.po
+++ b/tde-i18n-bg/messages/tdepim/libkpgp.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2008-08-14 00:49+0000\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -18,6 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -38,7 +50,7 @@ msgstr "Паролата е твърде дълга, трябва бъде по-
 msgid "Out of memory."
 msgstr "Недостиг на памет."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -47,73 +59,73 @@ msgstr ""
 "Искате ли да опитате отново или да прекъснете и да видите съобщението "
 "неразшифровано?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Предупреждение на PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "От&ново"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Въведохте грешна парола.\n"
-"Искате ли да опитате отново, или съобщението да бъде изпратено неподписано или "
-"изпращането му да бъде прекъснато?"
+"Искате ли да опитате отново, или съобщението да бъде изпратено неподписано "
+"или изпращането му да бъде прекъснато?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Изпращане &неподписано"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "Грешка при подписване: %1\n"
-"Искате ли съобщението да бъде изпратено неподписано или изпращането му да бъде "
-"прекъснато?"
+"Искате ли съобщението да бъде изпратено неподписано или изпращането му да "
+"бъде прекъснато?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "Невалиден ключ: %1\n"
 "Искате ли съобщението да бъде шифровано въпреки това, или да бъде изпратено "
 "така както е или изпращането му да бъде прекъснато?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Изпращане на &шифровано"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Изпращане на &нешифровано"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Искате ли съобщението да бъде изпратено така както е или изпращането му да бъде "
-"прекъснато?"
+"Искате ли съобщението да бъде изпратено така както е или изпращането му да "
+"бъде прекъснато?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Изпращане &нешифровано"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -122,7 +134,7 @@ msgstr ""
 "Появи се следната грешка:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -130,39 +142,40 @@ msgstr ""
 "Съобщение за грешка от %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Не сте избрали ключ за шифроване на получателя на съобщението. Съобщението няма "
-"да бъде шифровано."
+"Не сте избрали ключ за шифроване на получателя на съобщението. Съобщението "
+"няма да бъде шифровано."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Не сте избрали ключове за шифроване на нито един от получателите на "
 "съобщението. Съобщението няма да бъде шифровано."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Не сте избрали ключ за шифроване на един от получателите на съобщението. Този "
-"получател няма да може да разшифрова съобщението, ако то бъде шифровано."
+"Не сте избрали ключ за шифроване на един от получателите на съобщението. "
+"Този получател няма да може да разшифрова съобщението, ако то бъде шифровано."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "Не сте избрали ключ за шифроване на няколко от получателите на съобщението. "
-"Тези получатели няма да могат да разшифрова съобщението, ако то бъде шифровано."
+"Тези получатели няма да могат да разшифрова съобщението, ако то бъде "
+"шифровано."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -170,18 +183,18 @@ msgstr ""
 "Тази възможност\n"
 "все още липсва"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Нямате инсталирана програмата GnuPG/PGP или сте избрали да не я ползвате "
 "GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Избор на ключ за шифроване"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -193,7 +206,7 @@ msgstr ""
 "\n"
 "Моля, изберете ключа(овете), които ще бъдат използвани за получателя."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -205,7 +218,7 @@ msgstr ""
 "\n"
 "Моля, изберете ключа(овете), които ще бъдат използвани за получателя."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -265,8 +278,8 @@ msgstr "Грешна парола, съобщението не може да б�
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr "Грешка при подписване. Моля, проверете настройки на PGP."
 
 #: kpgpbase2.cpp:213
@@ -308,8 +321,8 @@ msgstr "Въведената парола е грешна."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Ключът(овете), с които искате да шифровате вашето съобщение не са надеждни. "
 "Съобщението не е шифровано."
@@ -362,7 +375,7 @@ msgstr "Подписването се провали, защото вашият
 msgid "Error running gpg"
 msgstr "Грешка при изпълнение на GPG"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (файлът ~/.gnupg/pubring.gpg не е намерен)"
 
@@ -378,14 +391,19 @@ msgstr ""
 "Моля, въведете парола на OpenPGP за\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Предупреждение на PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Моля, проверете дали, шифроването наистина работи преди да започнете да го "
-"използвате сериозно. Имайте предвид, че прикачените файлове не се шифроват от "
-"модул PGP/GPG."
+"използвате сериозно. Имайте предвид, че прикачените файлове не се шифроват "
+"от модул PGP/GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -419,34 +437,36 @@ msgstr "PGP Version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Без използване на шифроване"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Запомняне на паролата в паметта"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ако отметката е включена, паролата, която използвате за личния ключ, ще бъде "
-"запомнена в паметта, докато програмата се изпълнява. По този начин, трябва да "
-"въведете само веднъж паролата, когато стартирате програмата.</p>"
-"<p>Имайте предвид, че това може да създаде проблеми, ако оставите компютъра си "
-"без наблюдение. Някой друг може да използва компютъра ви да изпраща подписани "
-"съобщения или да чете шифрованите ви съобщения. Също така, ако програмата забие "
-"има опасност паролата да бъде записана на твърдия диск.</p>"
-"<p>Ако използвате KMail, тези настройката е валидна само ако не използвате gpg. "
-"Също така, настройката се игнорира ако използвате приставки за шифроване.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Ако отметката е включена, паролата, която използвате за личния ключ, "
+"ще бъде запомнена в паметта, докато програмата се изпълнява. По този начин, "
+"трябва да въведете само веднъж паролата, когато стартирате програмата.</"
+"p><p>Имайте предвид, че това може да създаде проблеми, ако оставите "
+"компютъра си без наблюдение. Някой друг може да използва компютъра ви да "
+"изпраща подписани съобщения или да чете шифрованите ви съобщения. Също така, "
+"ако програмата забие има опасност паролата да бъде записана на твърдия диск."
+"</p><p>Ако използвате KMail, тези настройката е валидна само ако не "
+"използвате gpg. Също така, настройката се игнорира ако използвате приставки "
+"за шифроване.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -454,16 +474,14 @@ msgstr "Шифроване за &лична употреба"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ако отметката е включена, съобщението/файлът ще бъде шифрован и с вашия "
-"публичен ключ. По този начин съобщението/файла ще бъде съхранен при вас "
-"шифрован. Разбира се, по-късно може да го разшифровате.</p></qt>"
+"<qt><p>Ако отметката е включена, съобщението/файлът ще бъде шифрован и с "
+"вашия публичен ключ. По този начин съобщението/файла ще бъде съхранен при "
+"вас шифрован. Разбира се, по-късно може да го разшифровате.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -471,17 +489,15 @@ msgstr "Показване &на подписания/шифрования те�
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ако отметката е включена, подписаното/шифрованото съобщение ще бъде показано "
-"в отделен прозорец. По този начин, ще може да видите как ще изглежда "
-"съобщението. Също така, може да използвате настройката, за да проверите дали "
-"работи системата ви за шифроване.</p></qt>"
+"<qt><p>Ако отметката е включена, подписаното/шифрованото съобщение ще бъде "
+"показано в отделен прозорец. По този начин, ще може да видите как ще "
+"изглежда съобщението. Също така, може да използвате настройката, за да "
+"проверите дали работи системата ви за шифроване.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -489,19 +505,18 @@ msgstr "Показване на &диалога за избор на ключ(о
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Ако отметката е включена, програмата винаги ще показва диалога за избор на "
-"ключ за шифроване. В повечето случаи, програмата ще покаже предполагаемия ключ "
-"и вие трябва само да го потвърдите. Ако отметката е изключена, предполагаемия "
-"ключ, ще бъде избиран автоматично, ако е възможно. Ако няма намерен ключ или "
-"има намерени няколко ключа, които могат да бъдат използвани, диалогът ще бъде "
-"показван.</p></qt>"
+"<qt><p>Ако отметката е включена, програмата винаги ще показва диалога за "
+"избор на ключ за шифроване. В повечето случаи, програмата ще покаже "
+"предполагаемия ключ и вие трябва само да го потвърдите. Ако отметката е "
+"изключена, предполагаемия ключ, ще бъде избиран автоматично, ако е възможно. "
+"Ако няма намерен ключ или има намерени няколко ключа, които могат да бъдат "
+"използвани, диалогът ще бъде показван.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -521,13 +536,11 @@ msgstr "Запомняне на избора"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ако включите отметката, изборът ви ще бъде запомнен и няма да бъдете питан "
-"отново.</p></qt>"
+"<qt><p>Ако включите отметката, изборът ви ще бъде запомнен и няма да бъдете "
+"питан отново.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -626,6 +639,10 @@ msgstr "Избор на ключ OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Моля, изберете ключ OpenPGP за използване."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Промяна..."
@@ -701,7 +718,8 @@ msgid ""
 "Select the key(s) which should be used to encrypt the message for\n"
 "%1"
 msgstr ""
-"Изберете ключ(ове), които ще бъдат използвани за шифроване на съобщенията за\n"
+"Изберете ключ(ове), които ще бъдат използвани за шифроване на съобщенията "
+"за\n"
 "%1"
 
 #: kpgpui.cpp:1619
diff --git a/tde-i18n-br/messages/tdepim/libkpgp.po b/tde-i18n-br/messages/tdepim/libkpgp.po
index d1399b41a54..5c1be6fc160 100644
--- a/tde-i18n-br/messages/tdepim/libkpgp.po
+++ b/tde-i18n-br/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/libkpgp.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,67 +46,67 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Memor ebet."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Kemennadenn PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Klask adarre"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr ""
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr ""
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr ""
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr ""
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -103,7 +115,7 @@ msgstr ""
 "Degouezhet ez eus ur fazi a heul :\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -111,46 +123,46 @@ msgstr ""
 "Setu kemennad fazi %1 :\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr ""
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Dibab alc'hwez an enrinegadur"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -159,7 +171,7 @@ msgid ""
 "Please re-select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -168,7 +180,7 @@ msgid ""
 "Select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -211,8 +223,8 @@ msgstr "Lavarenn tremen fall; n'em eus ket sinañ."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 
 #: kpgpbase2.cpp:213
@@ -251,8 +263,8 @@ msgstr "Al lavarenn tremen e bizskrivoc'h zo siek."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 
 #: kpgpbase5.cpp:157
@@ -299,7 +311,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "Fazi en ur seveniñ gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr " ??? (restr ~/.gnupg/pubring.pgp n'eo ket kavet)"
 
@@ -315,6 +327,11 @@ msgstr ""
 "Roit al lavarenn tremen OpenPGP evit\n"
 "« %1 »"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Kemennadenn PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -353,22 +370,25 @@ msgstr "PGP stumm 6.x"
 msgid "Do not use any encryption tool"
 msgstr ""
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr ""
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:174
@@ -377,11 +397,10 @@ msgstr "Enrinegañ bepred an &unan"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:188
@@ -390,11 +409,10 @@ msgstr ""
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:200
@@ -403,11 +421,11 @@ msgstr ""
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
 
 #: kpgpui.cpp:327
@@ -428,9 +446,8 @@ msgstr ""
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:391
@@ -530,6 +547,10 @@ msgstr "Choaz an alc'hwez OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr ""
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Kemmañ ..."
diff --git a/tde-i18n-ca/messages/tdepim/libkpgp.po b/tde-i18n-ca/messages/tdepim/libkpgp.po
index 465218f7df5..6f7807d7f01 100644
--- a/tde-i18n-ca/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ca/messages/tdepim/libkpgp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-04-22 19:42+0200\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -38,7 +50,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Memòria exhaurida."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -46,30 +58,30 @@ msgstr ""
 "Heu introduït una contrasenya incorrecta.\n"
 "Desitgeu provar-ho altra vegada o cancel·lar i veure'l sense desxifrar?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Advertència PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Reintenta"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Heu introduït una frase de contrasenya no vàlida.\n"
-"Desitgeu provar-ho novament, continuar i deixar-lo sense signar o cancel·lar el "
-"seu enviament?"
+"Desitgeu provar-ho novament, continuar i deixar-lo sense signar o cancel·lar "
+"el seu enviament?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Envia &sense signar"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -78,26 +90,26 @@ msgstr ""
 "%1\n"
 "Desitgeu enviar el missatge sense signar o cancel·lar-ne l'enviament?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "El voleu xifrar igualment, deixar el missatge com està, o cancel·lar "
 "l'enviament del missatge?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Envia &xifrat"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Envia sense &xifrar"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -106,11 +118,11 @@ msgstr ""
 "%1\n"
 "Desitgeu deixar el missatge tal qual o cancel·lar-ne l'enviament?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Envia t&al qual"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -119,7 +131,7 @@ msgstr ""
 "Ha ocorregut el següent error:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -127,7 +139,7 @@ msgstr ""
 "Aquest és el missatge d'error de %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -135,15 +147,15 @@ msgstr ""
 "No heu seleccionat una clau de xifrat pel destinatari d'aquest missatge; per "
 "tant, el missatge no es xifrarà."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "No heu seleccionat una clau de xifrat per algun dels destinataris d'aquest "
 "missatge; per tant, el missatge no es xifrarà."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -151,7 +163,7 @@ msgstr ""
 "No heu seleccionat una clau de xifrat per a un dels destinataris; aquesta "
 "persona no podrà desxifrar el missatge si el xifreu."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -159,7 +171,7 @@ msgstr ""
 "No heu seleccionat una clau de xifrat per algun dels destinataris; aquestes "
 "persones no podran desxifrar el missatge si el xifreu."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -167,16 +179,16 @@ msgstr ""
 "Aquesta opció encara\n"
 "no està implementada"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "O no teniu el GnuPG/PGP instal·lat o heu escollit no emprar-lo."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Selecció de la clau de xifrat"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -189,7 +201,7 @@ msgstr ""
 "Si us plau, seleccioneu novament les claus que s'hauran d'emprar per aquest "
 "destinatari."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -201,7 +213,7 @@ msgstr ""
 "\n"
 "Seleccioneu la(es) clau(s) que s'haurà d'emprar per aquest destinatari."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -239,8 +251,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"Claus públiques no certificades amb una signatura de confiança dels usuari(s) "
-"id.\n"
+"Claus públiques no certificades amb una signatura de confiança dels "
+"usuari(s) id.\n"
 "%1.\n"
 "El missatge no serà xifrat."
 
@@ -261,11 +273,11 @@ msgstr "Frase de contrasenya incorrecta; no es pot signar."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Error al signar: si us plau, reviseu la vostra identitat PGP, la configuració "
-"PGP i els anells PGP."
+"Error al signar: si us plau, reviseu la vostra identitat PGP, la "
+"configuració PGP i els anells PGP."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -305,11 +317,11 @@ msgstr "La frase de contrasenya introduïda és incorrecta."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"La(es) clau(s) que desitgeu emprar per a xifrar no són de confiança. No es farà "
-"el xifrat."
+"La(es) clau(s) que desitgeu emprar per a xifrar no són de confiança. No es "
+"farà el xifrat."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -358,7 +370,7 @@ msgstr "Falla al signar perque la vostra clau secreta és inusable."
 msgid "Error running gpg"
 msgstr "Error en executar el gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (no es troba al fitxer ~.gnupgp/pubring.pgp)"
 
@@ -374,6 +386,11 @@ msgstr ""
 "Si us plau, introduïu la vostra frase contrasenya OpenPGP per a\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Advertència PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -414,34 +431,35 @@ msgstr "PGP Versió 6.x"
 msgid "Do not use any encryption tool"
 msgstr "No emprar cap eina de xifrat"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Ma&ntenir la frase de contrasenya en memòria"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Quan aquesta opció estiga habilitada, l'aplicació recordarà la frase de "
-"contrasenya de la vostra clau privada mentre estiga funcionant. Pel que només "
-"haureu d'indicar-la una sola vegada.</p>"
-"<p>Aneu amb cura, ja que això implica un risc en la seguretat. Si deixeu el "
-"vostre ordinador, d'altres podrien usar-lo per a enviar i/o llegir els vostres "
-"correus electrònics firmats o xifrats. Si es produeix un bolcat del nucli, el "
-"contingut de la vostra RAM serà desat al disc.</p>"
-"<p>Tingueu present que quan useu KMail, aquest valor només s'aplicarà si no "
-"esteu emprant gpg-agent. Tanmateix, també s'ignorarà si esteu emprant "
-"connectors de xifrat.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Quan aquesta opció estiga habilitada, l'aplicació recordarà la frase "
+"de contrasenya de la vostra clau privada mentre estiga funcionant. Pel que "
+"només haureu d'indicar-la una sola vegada.</p><p>Aneu amb cura, ja que això "
+"implica un risc en la seguretat. Si deixeu el vostre ordinador, d'altres "
+"podrien usar-lo per a enviar i/o llegir els vostres correus electrònics "
+"firmats o xifrats. Si es produeix un bolcat del nucli, el contingut de la "
+"vostra RAM serà desat al disc.</p><p>Tingueu present que quan useu KMail, "
+"aquest valor només s'aplicarà si no esteu emprant gpg-agent. Tanmateix, "
+"també s'ignorarà si esteu emprant connectors de xifrat.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -449,16 +467,14 @@ msgstr "Sempre xifrar a si &mateix"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quan aquesta opció estiga habilitada, el missatge/fitxer no només serà "
-"xifrat amb la clau pública del destinatari, sinó que també es farà amb la "
-"vostra clau pública. Això us permetrà desxifrar el missatge/fitxer més "
+"<qt><p>Quan aquesta opció estiga habilitada, el missatge/fitxer no només "
+"serà xifrat amb la clau pública del destinatari, sinó que també es farà amb "
+"la vostra clau pública. Això us permetrà desxifrar el missatge/fitxer més "
 "endavant. Això és generalment una bona idea.</p></qt>"
 
 #: kpgpui.cpp:188
@@ -467,17 +483,15 @@ msgstr "&Mostra el text signat/xifrat després de compondre'l"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quan aquesta opció estiga habilitada, el text signat/xifrat serà mostrat a "
-"una finestra diferent, permetent-vos conèixer l'aspecte que tindrà abans que "
-"s'enviï. Això és una bona idea per a quan vulgueu verificar que el vostre "
-"sistema de xifrat funciona.</p></qt>"
+"<qt><p>Quan aquesta opció estiga habilitada, el text signat/xifrat serà "
+"mostrat a una finestra diferent, permetent-vos conèixer l'aspecte que tindrà "
+"abans que s'enviï. Això és una bona idea per a quan vulgueu verificar que el "
+"vostre sistema de xifrat funciona.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -485,18 +499,17 @@ msgstr "Mostra sempre les claus de xifrat &per aprovar-les"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Quan aquesta opció estiga habilitada, l'aplicació també us mostrarà una "
-"llista amb les vostres claus públiques, d'on podreu triar la que vulgueu emprar "
-"per al xifrat. Si no ho està, l'aplicació només us mostrarà la caixa de diàleg "
-"sinó pot trobar la clau adequada o si hi ha diverses claus que es podrien "
-"emprar.</p></qt>"
+"<qt><p>Quan aquesta opció estiga habilitada, l'aplicació també us mostrarà "
+"una llista amb les vostres claus públiques, d'on podreu triar la que vulgueu "
+"emprar per al xifrat. Si no ho està, l'aplicació només us mostrarà la caixa "
+"de diàleg sinó pot trobar la clau adequada o si hi ha diverses claus que es "
+"podrien emprar.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -516,13 +529,11 @@ msgstr "Recorda l'elecció"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Si marqueu aquesta caixa la vostra opció serà desada i no se us preguntarà "
-"cap altra vegada.</p></qt>"
+"<qt><p>Si marqueu aquesta caixa la vostra opció serà desada i no se us "
+"preguntarà cap altra vegada.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -621,6 +632,10 @@ msgstr "Selecció de la clau OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Si us plau, seleccioneu la clau OpenPGP a usar."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Canvia..."
@@ -685,8 +700,8 @@ msgid ""
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
 msgstr ""
-"Seleccioneu la(es) clau(s) que s'haurà d'emprar per a xifrar el missatge per a "
-"vos."
+"Seleccioneu la(es) clau(s) que s'haurà d'emprar per a xifrar el missatge per "
+"a vos."
 
 #: kpgpui.cpp:1543
 #, c-format
@@ -696,7 +711,8 @@ msgid ""
 "Select the key(s) which should be used to encrypt the message for\n"
 "%1"
 msgstr ""
-"Seleccioneu la(es) clau(s) que s'haurà d'emprar per a xifrar el missatge per a\n"
+"Seleccioneu la(es) clau(s) que s'haurà d'emprar per a xifrar el missatge per "
+"a\n"
 "%1"
 
 #: kpgpui.cpp:1619
diff --git a/tde-i18n-cs/messages/tdepim/libkpgp.po b/tde-i18n-cs/messages/tdepim/libkpgp.po
index 446f12cffb0..fc05b9e1c00 100644
--- a/tde-i18n-cs/messages/tdepim/libkpgp.po
+++ b/tde-i18n-cs/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-02-08 15:19+0100\n"
 "Last-Translator: Lukáš Tinkl <lukas@kde.org>\n"
 "Language-Team: Czech <kde-czech-apps@lists.sf.net>\n"
@@ -13,8 +13,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
 
 #: kpgp.cpp:187
 msgid ""
@@ -36,7 +48,7 @@ msgstr "Heslo je příliš dlouhé, musí obsahovat méně než 1024 znaků."
 msgid "Out of memory."
 msgstr "Nedostatek paměti."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -45,16 +57,16 @@ msgstr ""
 "Chcete to zkusit znovu, nebo zrušit tuto činnost a prohlédnout si ji "
 "zašifrovanou?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Varování PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Znovu"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -64,11 +76,11 @@ msgstr ""
 "Chcete to zkusit znovu, pokračovat a nechat zprávu nepodepsanou, nebo zrušit "
 "její odeslání?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Od&eslat nepodepsané"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -77,25 +89,25 @@ msgstr ""
 "%1\n"
 "Chcete nechat zprávu nepodepsanou, nebo zrušit její odeslání?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Přejete si přesto zašifrovat, ponechat zprávu jak je, nebo zrušit odeslání?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Od&eslat zašifrovaně"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Odeslat neši&frovaně"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -104,11 +116,11 @@ msgstr ""
 "%1\n"
 "Chcete nechat zprávu tak jak je, nebo zrušit její odeslání?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Po&slat tak, jak je"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +129,7 @@ msgstr ""
 "Nastala tato chyba:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,7 +137,7 @@ msgstr ""
 "Toto je chybová zpráva z %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -133,31 +145,31 @@ msgstr ""
 "Nevybrali jste šifrovací klíč pro příjemce této zprávy. Tudíž zpráva nebude "
 "zašifrována."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Nevybrali jste šifrovací klíč pro žádného z příjemců této zprávy. Tudíž zpráva "
-"nebude zašifrována."
+"Nevybrali jste šifrovací klíč pro žádného z příjemců této zprávy. Tudíž "
+"zpráva nebude zašifrována."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nevybrali jste šifrovací klíč pro jednoho z příjemců této zprávy. Tudíž tento "
-"příjemce nebude schopen zprávu rozšifrovat."
+"Nevybrali jste šifrovací klíč pro jednoho z příjemců této zprávy. Tudíž "
+"tento příjemce nebude schopen zprávu rozšifrovat."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nevybrali jste šifrovací klíče pro některé z příjemců této zprávy. Tudíž tito "
-"příjemci nebudou schopni zprávu rozšifrovat."
+"Nevybrali jste šifrovací klíče pro některé z příjemců této zprávy. Tudíž "
+"tito příjemci nebudou schopni zprávu rozšifrovat."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,17 +177,17 @@ msgstr ""
 "Bohužel, tato možnost dosud\n"
 "není podporována."
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Buďto nemáte GnuPG/PGP nainstalováno, anebo jste zvolili je nepoužívat."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Výběr šifrovacího klíče"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -186,7 +198,7 @@ msgstr ""
 "Nastal problém se šifrovacími klíči pro \"%1\".\n"
 "Prosím vyberte znovu klíče, které mají být použity pro tohoto příjemce."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -198,7 +210,7 @@ msgstr ""
 "\n"
 "Zvolte klíče, které budou použity pro tohoto příjemce."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -256,8 +268,8 @@ msgstr "Špatné heslo; není možno podepsat."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Podepisování selhalo. Prosím zkontrolujte nastavení PGP identity a klíče."
 
@@ -299,11 +311,11 @@ msgstr "Heslo, které jste zadali, je neplatné."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Klíč(e), které chcete použít pro šifrování zprávy jsou nedůvěryhodné. Šifrování "
-"neprovedeno."
+"Klíč(e), které chcete použít pro šifrování zprávy jsou nedůvěryhodné. "
+"Šifrování neprovedeno."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -352,7 +364,7 @@ msgstr "Podepisování selhalo, jelikož váš privátní klíč je nepoužiteln
 msgid "Error running gpg"
 msgstr "Chyba při spouštění gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (soubor ~.gnupg/pubring.gpg nenalezen)"
 
@@ -368,6 +380,11 @@ msgstr ""
 "Prosím vložte heslo OpenPGP pro\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Varování PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -408,33 +425,34 @@ msgstr "PGP verze 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Nepoužívat nástroj pro šifrování"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Ponechat heslo v paměti"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pokud je tato volba povolena, tak si aplikace zapamatuje heslo vašeho "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Pokud je tato volba povolena, tak si aplikace zapamatuje heslo vašeho "
 "soukromého klíče do jejího ukončení. Budete tedy muset zadat heslo pouze "
-"jednou.</p>"
-"<p>Uvědomte si prosím, že se jedná o potenciální bezpečnostní riziko. Pokud "
-"opustíte váš počítač, ostatní mohou poslat emaily podepsané vámi nebo číst vaše "
-"zašifrované emaily. Pokud provedete dump jádra, tak se obsah paměti RAM uloží "
-"na disk včetně vašeho hesla.</p>"
-"<p>Při použití KMail se nastavení použije pouze v případě, že nepoužíváte gpg "
-"agenta. Bude také ignorováno, pokud používáte kryprografické pluginy.</p></qt>"
+"jednou.</p><p>Uvědomte si prosím, že se jedná o potenciální bezpečnostní "
+"riziko. Pokud opustíte váš počítač, ostatní mohou poslat emaily podepsané "
+"vámi nebo číst vaše zašifrované emaily. Pokud provedete dump jádra, tak se "
+"obsah paměti RAM uloží na disk včetně vašeho hesla.</p><p>Při použití KMail "
+"se nastavení použije pouze v případě, že nepoužíváte gpg agenta. Bude také "
+"ignorováno, pokud používáte kryprografické pluginy.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -442,16 +460,14 @@ msgstr "Vžd&y šifrovat pro sebe"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pokud je tato volba povolena, tak zprávy/soubory nebudou zakódovány pouze "
-"klíčem příjemce, ale i klíčem vaším. To vám umožní dekódovat zprávy/soubory "
-"později. Je dobré mít tuto volbu povolenou.</p></qt>"
+"<qt><p>Pokud je tato volba povolena, tak zprávy/soubory nebudou zakódovány "
+"pouze klíčem příjemce, ale i klíčem vaším. To vám umožní dekódovat zprávy/"
+"soubory později. Je dobré mít tuto volbu povolenou.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -459,17 +475,15 @@ msgstr "Zobrazit zašifrovaný/podep&saný text po vytvoření"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pokud je tato volba povolena, podepsané/zašifrované zprávy budou zobrazeny v "
-"jiném okně, tak abyste mohli zkontrolovat, jak budou vypadat, ještě než se "
-"odešlou. Doporučuje se povolit v případě, kdy testujete, zda-li váš kódovací "
-"systém pracuje správně.</p></qt>"
+"<qt><p>Pokud je tato volba povolena, podepsané/zašifrované zprávy budou "
+"zobrazeny v jiném okně, tak abyste mohli zkontrolovat, jak budou vypadat, "
+"ještě než se odešlou. Doporučuje se povolit v případě, kdy testujete, zda-li "
+"váš kódovací systém pracuje správně.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -477,17 +491,16 @@ msgstr "Vždy zobrazit ši&frovací klíče ke schválení"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Pokud je tato volba povolena, tak vám aplikace vždy zobrazí seznam veřejných "
-"klíčů, ze kterých si budete moci jeden vybrat pro zašifrování. Pokud je volba "
-"zakázána, tak aplikace zobrazí dialog pouze v případě, že nemůže najít správný "
-"klíč nebo nalezla více použitelných klíčů.</p></qt>"
+"<qt><p>Pokud je tato volba povolena, tak vám aplikace vždy zobrazí seznam "
+"veřejných klíčů, ze kterých si budete moci jeden vybrat pro zašifrování. "
+"Pokud je volba zakázána, tak aplikace zobrazí dialog pouze v případě, že "
+"nemůže najít správný klíč nebo nalezla více použitelných klíčů.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -507,12 +520,10 @@ msgstr "Zapamatovat si výběr"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pokud zaškrtnete toto políčko, bude vaše volba uložena a již nebudete "
+"<qt><p>Pokud zaškrtnete toto políčko, bude vaše volba uložena a již nebudete "
 "dotazováni.</p></qt>"
 
 #: kpgpui.cpp:391
@@ -612,6 +623,10 @@ msgstr "Výběr klíče OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Prosím vyberte OpenPGP klíč k použití."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Změnit..."
diff --git a/tde-i18n-cy/messages/tdepim/libkpgp.po b/tde-i18n-cy/messages/tdepim/libkpgp.po
index b7c6ba1f05e..768169c8222 100644
--- a/tde-i18n-cy/messages/tdepim/libkpgp.po
+++ b/tde-i18n-cy/messages/tdepim/libkpgp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -33,7 +45,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Allan o gof."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -41,16 +53,16 @@ msgstr ""
 "Rydych wedi mewnosod cyfrin-ymadrodd sy'n annilys.\n"
 "Ydych eisiau ceisio eto, neu ddiddymu a gweld y neges heb ei chêl-ysgrifo?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Rhybudd PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Ail-geisio"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -60,11 +72,11 @@ msgstr ""
 "Ydych eisiau ceisio eto, mynd ymlaen a gadael y neges heb ei llofnodi, neu "
 "ddiddymu anfon y neges?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Anfon heb ei &Llofnodi"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -73,23 +85,23 @@ msgstr ""
 "%1\n"
 "Ydych eisiau anfon y neges heb ei llofnodi, neu ddiddymu anfon y neges?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Anfon wedi'i &Chêl-ysgrifo "
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Anfon &heb ei Chêl-ysgrifo "
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 #, fuzzy
 msgid ""
 "_: %1 = 'missing keys' error message\n"
@@ -99,11 +111,11 @@ msgstr ""
 "%1\n"
 "Ydych eisiau anfon y neges heb ei llofnodi, neu ddiddymu anfon y neges?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr ""
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -112,7 +124,7 @@ msgstr ""
 "Digwyddodd y gwall dilynol:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -120,31 +132,31 @@ msgstr ""
 "Dyma neges wall %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -152,16 +164,16 @@ msgstr ""
 "Ni chynhelir\n"
 "y nodwedd yma eto."
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -173,7 +185,7 @@ msgstr ""
 "\n"
 "Ail-ddewiswch yr allwedd(au) a ddylir eu defnyddio ar gyfer y derbyniwr yma."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -185,7 +197,7 @@ msgstr ""
 "\n"
 "Dewiswch yr allwedd(au) a ddylir eu defnyddio ar gyfer y derbyniwr yma."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -235,8 +247,8 @@ msgstr ""
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 
 #: kpgpbase2.cpp:213
@@ -277,11 +289,11 @@ msgstr "Mae'r cyfrin-ymadrodd a fewnosodir yn annilys."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Ni ymddiriedir yr allwedd(au) yr hoffech ddefnyddio i gêl-ysgrifo eich neges.  "
-"Ni wnaed cêl-ysgrifo."
+"Ni ymddiriedir yr allwedd(au) yr hoffech ddefnyddio i gêl-ysgrifo eich "
+"neges.  Ni wnaed cêl-ysgrifo."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -330,7 +342,7 @@ msgstr "Methodd llofnodi oherwydd mae eich allwedd gyfrinachol yn anghywir."
 msgid "Error running gpg"
 msgstr "Gwall wrth redeg gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (ni chanfuwyd y ffeil ~/.gnupg/pubring.gpg)"
 
@@ -346,13 +358,19 @@ msgstr ""
 "Mewnosodwch y cyfrin-ymadrodd OpenPGP ar gyfer\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Rhybudd PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Gwiriwch os mae'r atodiad yn gweithio yn iawn cyn i chi ddechrau ei ddefnyddio "
-"yn ddifrifol.  Noder hefyd na chêl-ysgrifir atodiadau gan y modiwl PGP/GPG."
+"Gwiriwch os mae'r atodiad yn gweithio yn iawn cyn i chi ddechrau ei "
+"ddefnyddio yn ddifrifol.  Noder hefyd na chêl-ysgrifir atodiadau gan y "
+"modiwl PGP/GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -386,34 +404,35 @@ msgstr "PGP Fersiwn 6.x"
 msgid "Do not use any encryption tool"
 msgstr ""
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Cadw'r cyfrin-ymadrodd mewn cof"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, cofier cyfrin-ymadrodd eich allwedd gyhoeddus "
-"tra mae'r cymhwysiad yn rhedeg.  Felly dim ond unwaith sydd angen mewnosod y "
-"cyfrin-ymadrodd.</p>"
-"<p>Sylwer y gall hyn fod yn berygl diogelwch.  Os gadewch eich cyfrifiadur, "
-"gall eraill ei ddefnyddio i angon negeseuon llofnodedig a/neu ddarllen eich "
-"negeseuon cêl-ysgrifedig.  Os tomennir y craidd, cedwir cynnwys eich RAM i'r "
-"ddisg, yn cynnwys eich cyfrin-ymadrodd.</p>"
-"<p>Noder: wrth ddefnyddio KMail, nid yw'r gosodiad yma yn dod i rym os nad "
-"ydych yn defnyddio gpg-agent. Anwybyddir hefyd os defnyddiwch ategion celu.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Pan alluogir y dewisiad yma, cofier cyfrin-ymadrodd eich allwedd "
+"gyhoeddus tra mae'r cymhwysiad yn rhedeg.  Felly dim ond unwaith sydd angen "
+"mewnosod y cyfrin-ymadrodd.</p><p>Sylwer y gall hyn fod yn berygl "
+"diogelwch.  Os gadewch eich cyfrifiadur, gall eraill ei ddefnyddio i angon "
+"negeseuon llofnodedig a/neu ddarllen eich negeseuon cêl-ysgrifedig.  Os "
+"tomennir y craidd, cedwir cynnwys eich RAM i'r ddisg, yn cynnwys eich cyfrin-"
+"ymadrodd.</p><p>Noder: wrth ddefnyddio KMail, nid yw'r gosodiad yma yn dod i "
+"rym os nad ydych yn defnyddio gpg-agent. Anwybyddir hefyd os defnyddiwch "
+"ategion celu.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -421,16 +440,14 @@ msgstr "Cêl-ysgrifo i'ch &hunan o hyd"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, cêl-ysgrifir y neges/ffeil nid yn unig efo "
-"allwedd gyhoeddus y derbyniwr, ond hefyd efo'ch allwedd chi.  Bydd hyn yn "
-"gadael i chi ddatgelu'r neges/ffeil yn nes ymlaen.  Fel rheol, mae hyn yn "
+"<qt><p>Pan alluogir y dewisiad yma, cêl-ysgrifir y neges/ffeil nid yn unig "
+"efo allwedd gyhoeddus y derbyniwr, ond hefyd efo'ch allwedd chi.  Bydd hyn "
+"yn gadael i chi ddatgelu'r neges/ffeil yn nes ymlaen.  Fel rheol, mae hyn yn "
 "syniad da.</p></qt>"
 
 #: kpgpui.cpp:188
@@ -439,17 +456,15 @@ msgstr "&Dangos testun llofnodedig/cêl-ysgrifedig wedi cyfansoddi"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, dangosir y testun llofnodedig/cêl-ysgrifedig "
-"mewn ffenestr ar wahân, wrth adael i chi wybod sut bydd o'n edrych cyn ei "
-"anfon.  Mae hyn yn syniad da pan rydych yn gwirio bod eich cysawd cêl-ysgrifo "
-"yn gweithio.</p></qt>"
+"<qt><p>Pan alluogir y dewisiad yma, dangosir y testun llofnodedig/cêl-"
+"ysgrifedig mewn ffenestr ar wahân, wrth adael i chi wybod sut bydd o'n "
+"edrych cyn ei anfon.  Mae hyn yn syniad da pan rydych yn gwirio bod eich "
+"cysawd cêl-ysgrifo yn gweithio.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -457,17 +472,16 @@ msgstr "Dangos yr allweddau &cêl-ysgrifo ar gyfer cymeradwydo o hyd"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
-msgstr ""
-"<qt>"
-"<p>Pan alluogir y dewisiad yma, bydd y cymhwysiad o hyd yn dangos i chi rhestr "
-"o allweddau cyhoeddus y gallwch ddewis un ohonynt i'w defnyddio ar gyfer "
-"cêl-ysgrifo.  Pan analluogir, ni fydd y cymhwysiad yn dangos yr ymgom ond os "
-"mae'n methu canfod yr allwedd iawn neu os mae mwy nag un a ellir eu "
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
+msgstr ""
+"<qt><p>Pan alluogir y dewisiad yma, bydd y cymhwysiad o hyd yn dangos i chi "
+"rhestr o allweddau cyhoeddus y gallwch ddewis un ohonynt i'w defnyddio ar "
+"gyfer cêl-ysgrifo.  Pan analluogir, ni fydd y cymhwysiad yn dangos yr ymgom "
+"ond os mae'n methu canfod yr allwedd iawn neu os mae mwy nag un a ellir eu "
 "defnyddio.</p></qt>"
 
 #: kpgpui.cpp:327
@@ -488,12 +502,11 @@ msgstr "Cofio'r dewis"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Os brithwch y blwch yma, cedwir eich dewis a ni ofynnir i chi eto.</p></qt>"
+"<qt><p>Os brithwch y blwch yma, cedwir eich dewis a ni ofynnir i chi eto.</"
+"p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -592,6 +605,10 @@ msgstr "Dewis Allwedd OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Dewis allwedd OpenPGP i ddefnyddio."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Newid..."
diff --git a/tde-i18n-da/messages/tdepim/libkpgp.po b/tde-i18n-da/messages/tdepim/libkpgp.po
index 2c21c1a30fc..08a6dbebde0 100644
--- a/tde-i18n-da/messages/tdepim/libkpgp.po
+++ b/tde-i18n-da/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-01-20 11:41-0500\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dl>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr "Løsenet er for langt. Det skal indeholde mindre end 1024 tegn."
 msgid "Out of memory."
 msgstr "Løbet tør for hukommelse."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,16 +54,16 @@ msgstr ""
 "Du indtastede netop et ugyldigt løsen\n"
 "Ønsker du at prøve igen, eller annullere og se beskeden ukrypteret"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP-advarsel"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Prøv igen"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,11 +73,11 @@ msgstr ""
 "Ønsker du at prøve igen, fortsætte og lade beskeden ikke være underskrevet, "
 "eller annullere at sende beskeden?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Send &ikke-underskrevet"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -75,26 +87,26 @@ msgstr ""
 "Ønsker du at sende beskeden ikke underskrevet, eller annullere at sende "
 "beskeden?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Vil du kryptere alligevel, efterlade meddelelsen som den er, eller afbryde "
 "afsendingen af meddelelsen?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Send &krypteret"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Send &ukrypteret"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -104,11 +116,11 @@ msgstr ""
 "Vil du efterlade meddelelsen som den er, eller afbryde afsendingen af "
 "meddelelsen?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Send &som det er"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +129,7 @@ msgstr ""
 "Følgende fejl opstod:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,7 +137,7 @@ msgstr ""
 "Dette er fejlmeddelelsen for %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -133,23 +145,23 @@ msgstr ""
 "Du valgte ikke en krypteringsnøgle for modtageren af dette brev. Derfor vil "
 "dette brev ikke blive krypteret."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Du valgte ikke en krypteringsnøgle for nogen af modtagerne af denne besked. "
 "Derfor vil det ikke blive krypteret."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du valgte ikke en krypteringsnøgle for en af modtagerne. Denne person vil ikke "
-"være i stand til at afkode brevet hvis du krypterer det."
+"Du valgte ikke en krypteringsnøgle for en af modtagerne. Denne person vil "
+"ikke være i stand til at afkode brevet hvis du krypterer det."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -157,7 +169,7 @@ msgstr ""
 "Du valgte ikke krypteringsnøgler for nogen af modtagerne. Disse personer vil "
 "ikke være i stand til at afkode brevet hvis du krypterer det."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,18 +177,18 @@ msgstr ""
 "Denne egenskab\n"
 "mangler stadigvæk"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
-"Enten har du ikke GnuPG/PGP installeret eller også har du valgt ikke at bruge "
-"GnuPG/PGP."
+"Enten har du ikke GnuPG/PGP installeret eller også har du valgt ikke at "
+"bruge GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Krypteringsnøgle-valg"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,7 +200,7 @@ msgstr ""
 "\n"
 "Vælg venligst de nøgler igen der skal bruges for denne modtager."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -200,7 +212,7 @@ msgstr ""
 "\n"
 "Vælg de nøgler der skal bruges for denne modtager."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -237,8 +249,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"Offentlige nøgler ikke godkendt med underskrifter der stoles på for "
-"bruger-id'erne\n"
+"Offentlige nøgler ikke godkendt med underskrifter der stoles på for bruger-"
+"id'erne\n"
 "%1.\n"
 "Brevet er ikke krypteret."
 
@@ -248,8 +260,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"Offentlige nøgler ikke godkendt med underskrifter der stoles på for "
-"bruger-id'erne\n"
+"Offentlige nøgler ikke godkendt med underskrifter der stoles på for bruger-"
+"id'erne\n"
 "%1.\n"
 "Disse personer vil ikkekunne læse brevet."
 
@@ -259,11 +271,11 @@ msgstr "Dårlig kodesætning; kunne ikke underskrive."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Underskrift lislykkedes. Tjek venligst din PGP-brugeridentitet PGP-opsætningen "
-"og nøgleringene."
+"Underskrift lislykkedes. Tjek venligst din PGP-brugeridentitet PGP-"
+"opsætningen og nøgleringene."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -304,8 +316,8 @@ msgstr "Det løsen du indtastede er ugyldigt."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "De(n) nøgle(r) du ønsker at bruge til kryptering er Ikke pålidelige. Ingen "
 "kryptering udført."
@@ -357,7 +369,7 @@ msgstr "Underskrift mislykkedes fordi din hemmelige nøgle er ubrugelig."
 msgid "Error running gpg"
 msgstr "Fejl ved kørsel af gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (filen ~/.gnupg/pubring.gpg ikke fundet)"
 
@@ -373,13 +385,18 @@ msgstr ""
 "Indtast venligst dit OpenPGP løsen for\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP-advarsel"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Undersøg venligst om indkodningen virker rigtigt før du begynder at  bruge den "
-"for alvor. Bemærk også at bilag ikke bliver indkodede af PGP/GPGmodulet."
+"Undersøg venligst om indkodningen virker rigtigt før du begynder at  bruge "
+"den for alvor. Bemærk også at bilag ikke bliver indkodede af PGP/GPGmodulet."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -413,33 +430,35 @@ msgstr "PGP Version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Brug ikke noget krypteringsværktøj"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Behold løsen i hukommelse"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Når dette er aktiveret, vil løsen for din private nøgle blive husket af "
-"programmet så længe programmet kører. Derfor vil du kun skulle indtaste løsen "
-"én gang.</p> "
-"<p>Vær klar over at dette kan være en sikkerhedsrisiko. Hvis du går væk fra din "
-"computer, kan andre bruge den til at sende underskrevne beskeder og/eller læse "
-"din krypterede post. Hvis du laver en kerne-dump, vil indholdet af din RAM "
-"blive gemt til disken, inklusive dit løsen.</p> "
-"<p>Bemærk at når du bruger KMail, anvendes denne indstilling kun hvis du ikke "
-"bruger gpg-agent. Den ignoreres også hvis du bruger crypto-plugin.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Når dette er aktiveret, vil løsen for din private nøgle blive husket "
+"af programmet så længe programmet kører. Derfor vil du kun skulle indtaste "
+"løsen én gang.</p> <p>Vær klar over at dette kan være en sikkerhedsrisiko. "
+"Hvis du går væk fra din computer, kan andre bruge den til at sende "
+"underskrevne beskeder og/eller læse din krypterede post. Hvis du laver en "
+"kerne-dump, vil indholdet af din RAM blive gemt til disken, inklusive dit "
+"løsen.</p> <p>Bemærk at når du bruger KMail, anvendes denne indstilling kun "
+"hvis du ikke bruger gpg-agent. Den ignoreres også hvis du bruger crypto-"
+"plugin.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -447,17 +466,15 @@ msgstr "Kryptér altid &til dig selv"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Når dette er aktiverer vil brevet/filen ikke kun blive krypteret med "
+"<qt><p>Når dette er aktiverer vil brevet/filen ikke kun blive krypteret med "
 "modtagerens offentlige nøgle, men også med din nøgle. Dette vil gøre dig i "
-"stand til at afkode brevet/filen på et senere tidspunkt. Dette er generelt en "
-"god idé.</p></qt>"
+"stand til at afkode brevet/filen på et senere tidspunkt. Dette er generelt "
+"en god idé.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -465,16 +482,15 @@ msgstr "&Vis underskrevet/krypteret tekst efter komposition"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Når dette er aktiveret, vil den underskrevne/krypterede tekst blive vist i "
-"et adskilt vindue, så du kan vide hvordan det vil se ud før det sendes. Dette "
-"er en god idé når du verificerer at dit krypteringssystem virker.</p></qt>"
+"<qt><p>Når dette er aktiveret, vil den underskrevne/krypterede tekst blive "
+"vist i et adskilt vindue, så du kan vide hvordan det vil se ud før det "
+"sendes. Dette er en god idé når du verificerer at dit krypteringssystem "
+"virker.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -482,17 +498,17 @@ msgstr "Vis altid indkodningsnøgler til &godkendelse"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Når dette er aktiveret, vil programmet altid vise dig en liste af offentlige "
-"nøgler fra hvilke du kan vælge den det vil bruge til krypteringen. Hvis det er "
-"slået fra, vil programmet kun vise dialogen hvis det ikke kan finde den rigtige "
-"nøgle eller hvis der er flere der kunne bruges. </p></qt>"
+"<qt><p>Når dette er aktiveret, vil programmet altid vise dig en liste af "
+"offentlige nøgler fra hvilke du kan vælge den det vil bruge til "
+"krypteringen. Hvis det er slået fra, vil programmet kun vise dialogen hvis "
+"det ikke kan finde den rigtige nøgle eller hvis der er flere der kunne "
+"bruges. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -512,13 +528,11 @@ msgstr "Husk valg"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hvis du afkrydser dette felt vil dit valg blive gemt og du vil ikke blive "
-"spurgt igen.</p></qt>"
+"<qt><p>Hvis du afkrydser dette felt vil dit valg blive gemt og du vil ikke "
+"blive spurgt igen.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -617,6 +631,10 @@ msgstr "OpenGPG-nøglevalg"
 msgid "Please select an OpenPGP key to use."
 msgstr "Vælg venligst en OpenGPG-nøgle der skal bruges."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Ændr..."
diff --git a/tde-i18n-de/messages/tdepim/libkpgp.po b/tde-i18n-de/messages/tdepim/libkpgp.po
index f1e72719bf5..33145849b0b 100644
--- a/tde-i18n-de/messages/tdepim/libkpgp.po
+++ b/tde-i18n-de/messages/tdepim/libkpgp.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-01-13 21:53+0100\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -19,6 +19,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -40,39 +52,39 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Nicht genügend Speicher."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 "Der eingegebene Passwort-Satz ist ungültig.\n"
-"Wollen Sie noch einmal versuchen oder abbrechen und die Mitteilung anschauen, "
-"ohne zu entschlüsseln?"
+"Wollen Sie noch einmal versuchen oder abbrechen und die Mitteilung "
+"anschauen, ohne zu entschlüsseln?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP-Warnung"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Nochmals versuchen"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Der eingegebene Passwort-Satz ist ungültig.\n"
-"Wollen Sie noch einmal versuchen, fortsetzen ohne die Mitteilung zu signieren "
-"oder abbrechen ohne die Mitteilung zu senden?"
+"Wollen Sie noch einmal versuchen, fortsetzen ohne die Mitteilung zu "
+"signieren oder abbrechen ohne die Mitteilung zu senden?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "&Unsigniert Senden"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -82,40 +94,40 @@ msgstr ""
 " Wollen Sie die Mitteilung nicht signiert schicken oder das Senden der "
 "Mitteilung abbrechen?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Wollen Sie die Mitteilung trotzdem verschlüsseln, so lassen wie sie ist oder "
 "das Senden der Mitteilung abbrechen?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "&Verschlüsselt senden"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "&Unverschlüsselt senden"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Wollen Sie die Mitteilung so lassen wie sie ist oder das Senden der Mitteilung "
-"abbrechen?"
+"Wollen Sie die Mitteilung so lassen wie sie ist oder das Senden der "
+"Mitteilung abbrechen?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Unverändert &Senden"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -124,7 +136,7 @@ msgstr ""
 "Folgender Fehler ist aufgetreten:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -132,7 +144,7 @@ msgstr ""
 "Dies ist die Fehlermeldung von %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -140,47 +152,49 @@ msgstr ""
 "Sie haben keinen Schlüssel für den Empfänger der Mitteilung ausgewählt, die "
 "Mitteilung wird daher nicht verschlüsselt."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Sie haben keinen Schlüssel für keinen der Empfänger der Mitteilung ausgewählt, "
-"die Mitteilung wird daher nicht verschlüsselt."
+"Sie haben keinen Schlüssel für keinen der Empfänger der Mitteilung "
+"ausgewählt, die Mitteilung wird daher nicht verschlüsselt."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Sie haben keinen Schlüssel für einen der Empfänger der Mitteilung ausgewählt, "
-"der Empfänger der Mitteilung kann diese daher nicht entschlüsseln."
+"Sie haben keinen Schlüssel für einen der Empfänger der Mitteilung "
+"ausgewählt, der Empfänger der Mitteilung kann diese daher nicht "
+"entschlüsseln."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Sie haben keinen Schlüssel für mehrere der Empfänger der Mitteilung ausgewählt, "
-"diese Empfänger der Mitteilung können diese daher nicht entschlüsseln."
+"Sie haben keinen Schlüssel für mehrere der Empfänger der Mitteilung "
+"ausgewählt, diese Empfänger der Mitteilung können diese daher nicht "
+"entschlüsseln."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr "Noch nicht fertig gestellt."
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Sie haben GnuPG/PGP nicht installiert oder wollen GnuPG/PGP nicht nutzen."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Auswahl des Schlüssels zur Verschlüsselung"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -191,7 +205,7 @@ msgstr ""
 "Ein Problem mit den Verschlüsselungs-Schlüsseln für \"%1\" ist aufgetreten.\n"
 "Bitte wählen Sie den/die Schlüssel für diesen Empfänger nochmals aus."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -199,11 +213,12 @@ msgid ""
 "\n"
 "Select the key(s) which should be used for this recipient."
 msgstr ""
-"Es wurde kein gültiger und vertrauenswürdiger Schlüssel für \"%1\" gefunden.\n"
+"Es wurde kein gültiger und vertrauenswürdiger Schlüssel für \"%1\" "
+"gefunden.\n"
 "\n"
 "Wählen Sie den/die Schlüssel für diesen Empfänger."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -243,8 +258,8 @@ msgid ""
 msgstr ""
 "Die öffentlichen Schlüssel für die Benutzerkennungen\n"
 "%1\n"
-"sind nicht zertifiziert mit einer vertrauenswürdigen Signatur. Die Mitteilung "
-"wird nicht verschlüsselt."
+"sind nicht zertifiziert mit einer vertrauenswürdigen Signatur. Die "
+"Mitteilung wird nicht verschlüsselt."
 
 #: kpgpbase2.cpp:176
 msgid ""
@@ -254,8 +269,8 @@ msgid ""
 msgstr ""
 "Die öffentlichen Schlüssel für die Benutzerkennungen\n"
 "%1\n"
-"sind nicht zertifiziert mit einer vertrauenswürdigen Signatur. Diese Empfänger "
-"können die Mitteilung nicht lesen."
+"sind nicht zertifiziert mit einer vertrauenswürdigen Signatur. Diese "
+"Empfänger können die Mitteilung nicht lesen."
 
 #: kpgpbase2.cpp:197
 msgid "Bad passphrase; could not sign."
@@ -263,11 +278,11 @@ msgstr "Falscher Passwort-Satz, Signieren ist fehlgeschlagen."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Signieren fehlgeschlagen: Bitte PGP-Benutzeridentität, PGP-Einrichtung und die "
-"Schlüsselringe prüfen."
+"Signieren fehlgeschlagen: Bitte PGP-Benutzeridentität, PGP-Einrichtung und "
+"die Schlüsselringe prüfen."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -311,11 +326,11 @@ msgstr "Der eingegebene Passwort-Satz ist ungültig."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Der/die Schlüssel, mit denen Sie die Mitteilung verschlüsseln wollen sind nicht "
-"vertrauenswürdig. Es wurde nichts verschlüsselt."
+"Der/die Schlüssel, mit denen Sie die Mitteilung verschlüsseln wollen sind "
+"nicht vertrauenswürdig. Es wurde nichts verschlüsselt."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -364,7 +379,7 @@ msgstr "Das Signieren schlug fehl, weil der geheime Schlüssel unbrauchbar ist."
 msgid "Error running gpg"
 msgstr "Fehler beim Ausführen von gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (Datei ~/.gnupg/pubring.gpg nicht gefunden)"
 
@@ -380,14 +395,19 @@ msgstr ""
 "Bitte den OpenPGP-Passwort-Satz eingeben für\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP-Warnung"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Vor dem regelmäßigen Gebrauch sollten Sie überprüfen, ob die Verschlüsselung "
-"wirklich funktioniert. Bitte beachten Sie auch, dass Anhänge von PGP/GPG nicht "
-"verschlüsselt werden."
+"wirklich funktioniert. Bitte beachten Sie auch, dass Anhänge von PGP/GPG "
+"nicht verschlüsselt werden."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -421,34 +441,36 @@ msgstr "PGP Version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Kein Verschlüsselungsprogramm verwenden"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Passwort-Satz im Speicher halten"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ist diese Einstellung ausgewählt, so bleibt der Passwort-Satz für den "
-"privaten Schlüssel im Speicher, solange die Anwendung läuft. Der Passwort-Satz "
-"muss also nur einmal eingegeben werden.</p> "
-"<p>Beachten Sie jedoch, dass dies ein Sicherheitsrisiko darstellt. Sollten Sie "
-"zum Beispiel den PC verlassen, könnten Dritte signierte Mitteilungen versenden "
-"und/oder verschlüsselte Mitteilungen lesen. Tritt ein grober Programmfehler auf "
-"(ein so genannter Core-Dump) wird das RAM mitsamt dem Passwort im Klartext auf "
-"die Festplatte geschrieben.</p> "
-"<p>Für KMail gilt diese Einstellung nur, wenn nicht der gpg-Agent benutzt wird. "
-"Sie wird ebenfalls ignoriert, wenn Kryptografie-Module benutzt werden.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Ist diese Einstellung ausgewählt, so bleibt der Passwort-Satz für den "
+"privaten Schlüssel im Speicher, solange die Anwendung läuft. Der Passwort-"
+"Satz muss also nur einmal eingegeben werden.</p> <p>Beachten Sie jedoch, "
+"dass dies ein Sicherheitsrisiko darstellt. Sollten Sie zum Beispiel den PC "
+"verlassen, könnten Dritte signierte Mitteilungen versenden und/oder "
+"verschlüsselte Mitteilungen lesen. Tritt ein grober Programmfehler auf (ein "
+"so genannter Core-Dump) wird das RAM mitsamt dem Passwort im Klartext auf "
+"die Festplatte geschrieben.</p> <p>Für KMail gilt diese Einstellung nur, "
+"wenn nicht der gpg-Agent benutzt wird. Sie wird ebenfalls ignoriert, wenn "
+"Kryptografie-Module benutzt werden.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -456,17 +478,15 @@ msgstr "Immer auch mit eigenem Schlüssel verschlüsseln"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ist diese Einstellung gewählt, wird die Mitteilung/Datei nicht nur mit dem "
-"öffentlichen Schlüssel des Empfängers verschlüsselt, sondern auch mit Ihrem "
-"eigenen. So können Sie später die Mitteilung/Datei noch lesen. Diese "
-"Einstellung wird empfohlen.</p></qt> "
+"<qt><p>Ist diese Einstellung gewählt, wird die Mitteilung/Datei nicht nur "
+"mit dem öffentlichen Schlüssel des Empfängers verschlüsselt, sondern auch "
+"mit Ihrem eigenen. So können Sie später die Mitteilung/Datei noch lesen. "
+"Diese Einstellung wird empfohlen.</p></qt> "
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -474,17 +494,16 @@ msgstr "Signierten/verschlüsselten Text nach dem Schreiben &anzeigen"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ist diese Einstellung ausgewählt, wird der signierte/verschlüsselte Text in "
-"einem separaten Fenster nochmals angezeigt, so dass Sie sehen können, wie er "
-"aussieht, bevor Sie ihn versenden. Diese Einstellung ist nützlich, wenn Sie "
-"überprüfen wollen, dass das Verschlüsselungssystem richtig arbeitet.</p></qt>"
+"<qt><p>Ist diese Einstellung ausgewählt, wird der signierte/verschlüsselte "
+"Text in einem separaten Fenster nochmals angezeigt, so dass Sie sehen "
+"können, wie er aussieht, bevor Sie ihn versenden. Diese Einstellung ist "
+"nützlich, wenn Sie überprüfen wollen, dass das Verschlüsselungssystem "
+"richtig arbeitet.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -492,17 +511,17 @@ msgstr "Verschlüsselungsschlüssel immer zur Bestätigung &anzeigen"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt> "
-"<p>Ist diese Einstellung ausgewählt, zeigt Ihnen die Anwendung immer eine Liste "
-"der öffentlichen Schlüssel, von denen Sie einen zum Verschlüsseln wählen "
-"können. Ist diese Einstellung nicht ausgewählt, so zeigt die Anwendung den "
-"Dialog nur dann, wenn sie keinen bzw. mehrere Schlüssel gefunden hat.</p></qt>"
+"<qt> <p>Ist diese Einstellung ausgewählt, zeigt Ihnen die Anwendung immer "
+"eine Liste der öffentlichen Schlüssel, von denen Sie einen zum Verschlüsseln "
+"wählen können. Ist diese Einstellung nicht ausgewählt, so zeigt die "
+"Anwendung den Dialog nur dann, wenn sie keinen bzw. mehrere Schlüssel "
+"gefunden hat.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -522,13 +541,11 @@ msgstr "Auswahl merken"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Kreuzen Sie diese Einstellung an, wenn Ihre Auswahl abgespeichert werden "
-"soll. Sie werden dann nie mehr danach gefragt.</p></qt>"
+"<qt> <p>Kreuzen Sie diese Einstellung an, wenn Ihre Auswahl abgespeichert "
+"werden soll. Sie werden dann nie mehr danach gefragt.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -627,6 +644,10 @@ msgstr "Auswahl des OpenPGP-Schlüssels"
 msgid "Please select an OpenPGP key to use."
 msgstr "Bitte einen OpenPGP-Schlüssel auswählen."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Ändern ..."
diff --git a/tde-i18n-el/messages/tdepim/libkpgp.po b/tde-i18n-el/messages/tdepim/libkpgp.po
index 4cd59e4fc3e..a9121893d20 100644
--- a/tde-i18n-el/messages/tdepim/libkpgp.po
+++ b/tde-i18n-el/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-01-09 18:53+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -37,7 +49,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Έλλειψη μνήμης."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -46,16 +58,16 @@ msgstr ""
 "Θέλετε να ξαναδοκιμάσετε, ή να ακυρωθεί και να δείτε το μήνυμα χωρίς "
 "κρυπτογράφηση;"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Προειδοποίηση PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Προσπαθήστε ξανά"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -65,39 +77,40 @@ msgstr ""
 "Θέλετε να ξαναδοκιμάσετε, να συνεχίσετε χωρίς υπογραφή του μηνύματος, ή να "
 "ακυρωθεί η αποστολή του μηνύματος;"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Αποστολή αν&υπόγραφου"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Επιθυμείτε να στείλετε το μήνυμα χωρίς υπογραφή, ή να ακυρωθεί η αποστολή του;"
+"Επιθυμείτε να στείλετε το μήνυμα χωρίς υπογραφή, ή να ακυρωθεί η αποστολή "
+"του;"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Επιθυμείτε την κρυπτογράφησή του ούτως ή άλλως, να αφήσετε το μήνυμα ως είναι, "
-"ή να ακυρώσετε την αποστολή του μηνύματος;"
+"Επιθυμείτε την κρυπτογράφησή του ούτως ή άλλως, να αφήσετε το μήνυμα ως "
+"είναι, ή να ακυρώσετε την αποστολή του μηνύματος;"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Αποστολή &κρυπτογραφημένου"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Αποστολή μη κρυπτογρ&αφημένου"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -107,11 +120,11 @@ msgstr ""
 "Επιθυμείτε να αφήσετε το μήνυμα ως είναι, ή να ακυρώσετε την αποστολή του "
 "μηνύματος;"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Αποστολή ως είναι"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -120,7 +133,7 @@ msgstr ""
 "Το ακόλουθο σφάλμα συνέβη:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -128,39 +141,41 @@ msgstr ""
 "Αυτό είναι το μήνυμα σφάλματος από το %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για τον παραλήπτη αυτού του μηνύματος. "
-"Κατά συνέπεια αυτό το μήνυμα δε θα κρυπτογραφηθεί."
+"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για τον παραλήπτη αυτού του "
+"μηνύματος. Κατά συνέπεια αυτό το μήνυμα δε θα κρυπτογραφηθεί."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για κανέναν από τους παραλήπτες αυτού "
-"του μηνύματος. Κατά συνέπεια το μήνυμα δε θα κρυπτογραφηθεί."
+"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για κανέναν από τους παραλήπτες "
+"αυτού του μηνύματος. Κατά συνέπεια το μήνυμα δε θα κρυπτογραφηθεί."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για κάποιον από τους παραλήπτες: αυτό "
-"το άτομο δε θα μπορέσει να αποκρυπτογραφήσει το μήνυμα αν το κρυπτογραφήσετε."
+"Δεν επιλέξατε ένα κλειδί κρυπτογράφησης για κάποιον από τους παραλήπτες: "
+"αυτό το άτομο δε θα μπορέσει να αποκρυπτογραφήσει το μήνυμα αν το "
+"κρυπτογραφήσετε."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Δεν επιλέξατε κλειδιά κρυπτογράφησης για κάποιους από τους παραλήπτες. Αυτά τα "
-"άτομα δε θα μπορέσουν να αποκρυπτογραφήσουν το μήνυμα αν το κρυπτογραφήσετε."
+"Δεν επιλέξατε κλειδιά κρυπτογράφησης για κάποιους από τους παραλήπτες. Αυτά "
+"τα άτομα δε θα μπορέσουν να αποκρυπτογραφήσουν το μήνυμα αν το "
+"κρυπτογραφήσετε."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -168,18 +183,18 @@ msgstr ""
 "Αυτή η λειτουργία\n"
 "λείπει για την ώρα"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Είτε δεν έχετε το GnuPG/PGP εγκατεστημένο ή επιλέξατε να μην το "
 "χρησιμοποιήσετε."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Επιλογή κλειδιού κρυπτογράφησης"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -192,7 +207,7 @@ msgstr ""
 "Παρακαλώ επιλέξτε ξανά το κλειδί(ά) το οποίο θα χρησιμοποιηθεί από αυτόν τον "
 "παραλήπτη."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -204,7 +219,7 @@ msgstr ""
 "\n"
 "Επιλέξτε τα κλειδιά που πρέπει να χρησιμοποιηθούν γι' αυτόν τον παραλήπτη."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -264,16 +279,17 @@ msgstr "Λάθος φράση πρόσβασης. Δεν ήταν δυνατή �
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Η υπογραφή απέτυχε. Παρακαλώ έλεγξε την Ταυτότητα χρήστη PGP σας, τις ρυθμίσεις "
-"PGP και τα κλειδιά."
+"Η υπογραφή απέτυχε. Παρακαλώ έλεγξε την Ταυτότητα χρήστη PGP σας, τις "
+"ρυθμίσεις PGP και τα κλειδιά."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
 msgstr ""
-"Η κρυπτογράφηση απέτυχε. Παρακαλώ έλεγξε τις ρυθμίσεις PGP σας και τα κλειδιά."
+"Η κρυπτογράφηση απέτυχε. Παρακαλώ έλεγξε τις ρυθμίσεις PGP σας και τα "
+"κλειδιά."
 
 #: kpgpbase2.cpp:259 kpgpbase6.cpp:62 kpgpbase6.cpp:360
 msgid "error running PGP"
@@ -286,8 +302,8 @@ msgstr "Λάθος φράση πρόσβασης. Δεν ήταν δυνατή �
 #: kpgpbase2.cpp:310 kpgpbase5.cpp:238 kpgpbaseG.cpp:278
 msgid "You do not have the secret key needed to decrypt this message."
 msgstr ""
-"Δεν έχετε το μυστικό κλειδί που απαιτείται για την αποκρυπτογράφηση αυτού του "
-"μηνύματος."
+"Δεν έχετε το μυστικό κλειδί που απαιτείται για την αποκρυπτογράφηση αυτού "
+"του μηνύματος."
 
 #: kpgpbase2.cpp:450
 msgid ""
@@ -311,11 +327,11 @@ msgstr "Η φράση πρόσβασης που δώσατε δεν είναι �
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Το κλειδί(ά) που θέλετε για να κρυπτογραφήσετε το μήνυμα δεν είναι έμπιστα. Δεν "
-"έγινε κρυπτογράφηση."
+"Το κλειδί(ά) που θέλετε για να κρυπτογραφήσετε το μήνυμα δεν είναι έμπιστα. "
+"Δεν έγινε κρυπτογράφηση."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -359,13 +375,14 @@ msgstr "Η υπογραφή απέτυχε γιατί η φράση πρόσβα
 #: kpgpbaseG.cpp:190
 msgid "Signing failed because your secret key is unusable."
 msgstr ""
-"Η υπογραφή απέτυχε γιατί το μυστικό κλειδί σας είναι αδύνατο να χρησιμοποιηθεί."
+"Η υπογραφή απέτυχε γιατί το μυστικό κλειδί σας είναι αδύνατο να "
+"χρησιμοποιηθεί."
 
 #: kpgpbaseG.cpp:221
 msgid "Error running gpg"
 msgstr "Σφάλμα εκτέλεσης του gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (το αρχείο ~/.gnupg/pubring.gpg δε βρέθηκε)"
 
@@ -381,14 +398,19 @@ msgstr ""
 "Παρακαλώ δώστε τη φράση πρόσβασης OpenPGP για το \n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Προειδοποίηση PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Παρακαλώ ελέγξτε αν δουλεύει στ' αλήθεια η κρυπτογράφηση πριν αρχίσετε να τη "
-"χρησιμοποιείτε σοβαρά. Επίσης σημειώστε ότι τα συνημμένα δεν κρυπτογραφούνται "
-"από το άρθρωμα PGP/GPG."
+"χρησιμοποιείτε σοβαρά. Επίσης σημειώστε ότι τα συνημμένα δεν "
+"κρυπτογραφούνται από το άρθρωμα PGP/GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -422,34 +444,36 @@ msgstr "PGP έκδοση 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Να μη χρησιμοποιηθεί κανένα εργαλείο κρυπτογράφησης"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Διατήρηση της φράσης πρόσβασης στη μνήμη"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Αν ενεργοποιήσετε αυτή την επιλογή, η φράση πρόσβασης του ιδιωτικού κλειδιού "
-"σας θα απομνημονευθεί από την εφαρμογή για όσο χρόνο εκτελείται αυτή. Έτσι θα "
-"χρειαστεί να εισάγετε τη φράση πρόσβασης μόνο μια φορά.</p>"
-"<p>Σημειώστε ότι αυτό μπορεί να προκαλέσει πρόβλημα ασφαλείας. Αν αφήσετε τον "
-"υπολογιστή σας, κάποιοι θα μπορούν να στείλουν υπογραμμένα μηνύματα και/ή να "
-"διαβάσουν τα κρυπτογραφημένα μηνύματά σας. Αν συμβεί κάποια κατάρρευση του "
-"πυρήνα, τα περιεχόμενα της μνήμης RAM θα αποθηκευτούν στο δίσκο, περιέχοντας τη "
-"φράση πρόσβασης.</p>"
-"<p>Σημειώστε ότι κατά τη χρήση του KMail, αυτή η ρύθμιση έχει ισχύ μόνο με το "
-"gpg-agent. Αγνοείται επίσης αν χρησιμοποιείτε πρόσθετα κρυπτογράφησης.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Αν ενεργοποιήσετε αυτή την επιλογή, η φράση πρόσβασης του ιδιωτικού "
+"κλειδιού σας θα απομνημονευθεί από την εφαρμογή για όσο χρόνο εκτελείται "
+"αυτή. Έτσι θα χρειαστεί να εισάγετε τη φράση πρόσβασης μόνο μια φορά.</"
+"p><p>Σημειώστε ότι αυτό μπορεί να προκαλέσει πρόβλημα ασφαλείας. Αν αφήσετε "
+"τον υπολογιστή σας, κάποιοι θα μπορούν να στείλουν υπογραμμένα μηνύματα και/"
+"ή να διαβάσουν τα κρυπτογραφημένα μηνύματά σας. Αν συμβεί κάποια κατάρρευση "
+"του πυρήνα, τα περιεχόμενα της μνήμης RAM θα αποθηκευτούν στο δίσκο, "
+"περιέχοντας τη φράση πρόσβασης.</p><p>Σημειώστε ότι κατά τη χρήση του KMail, "
+"αυτή η ρύθμιση έχει ισχύ μόνο με το gpg-agent. Αγνοείται επίσης αν "
+"χρησιμοποιείτε πρόσθετα κρυπτογράφησης.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -457,17 +481,15 @@ msgstr "Πάντα κρυπτο&γράφηση στο ίδιο"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Αν ενεργοποιήσετε αυτή την επιλογή, το μήνυμα/αρχείο δε θα κρυπτογραφηθεί "
-"μόνο με το δημόσιο κλειδί του αποδέκτη, αλλά επίσης με το δικό σας κλειδί. Αυτό "
-"σας δίνει τη δυνατότητα να αποκρυπτογραφήσετε το μήνυμα/αρχείο κάποια άλλη "
-"στιγμή. Συνήθως αυτό είναι μια καλή ιδέα.</p></qt>"
+"<qt><p>Αν ενεργοποιήσετε αυτή την επιλογή, το μήνυμα/αρχείο δε θα "
+"κρυπτογραφηθεί μόνο με το δημόσιο κλειδί του αποδέκτη, αλλά επίσης με το "
+"δικό σας κλειδί. Αυτό σας δίνει τη δυνατότητα να αποκρυπτογραφήσετε το "
+"μήνυμα/αρχείο κάποια άλλη στιγμή. Συνήθως αυτό είναι μια καλή ιδέα.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -475,18 +497,16 @@ msgstr "&Εμφάνιση υπογεγραμμένου/κρυπτογραφημ�
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Αν ενεργοποιήσετε αυτή την επιλογή, το υπογεγραμμένο/κρυπτογραφημένο κείμενο "
-"θα εμφανιστεί σε ένα ξεχωριστό παράθυρο, έτσι ώστε να σας δώσει τη δυνατότητα "
-"θα γνωρίζετε τη μορφή του πριν την αποστολή. Αυτό είναι καλή ιδέα όταν "
-"προσπαθείτε να επαληθεύσετε ότι το σύστημα κρυπτογράφησής σας λειτουργεί.</p>"
-"</qt>"
+"<qt><p>Αν ενεργοποιήσετε αυτή την επιλογή, το υπογεγραμμένο/κρυπτογραφημένο "
+"κείμενο θα εμφανιστεί σε ένα ξεχωριστό παράθυρο, έτσι ώστε να σας δώσει τη "
+"δυνατότητα θα γνωρίζετε τη μορφή του πριν την αποστολή. Αυτό είναι καλή ιδέα "
+"όταν προσπαθείτε να επαληθεύσετε ότι το σύστημα κρυπτογράφησής σας "
+"λειτουργεί.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -494,18 +514,17 @@ msgstr "Συνεχής εμφάνιση των κλειδιών κρυπτογρ
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Αν ενεργοποιήσετε αυτή την επιλογή, η εφαρμογή θα σας εμφανίζει πάντα μια "
-"λίστα των δημόσιων κλειδιών από την οποία θα μπορείτε να επιλέγετε αυτό που θα "
-"χρησιμοποιηθεί για την κρυπτογράφηση. Αν είναι απενεργοποιημένη η επιλογή, η "
-"εφαρμογή θα εμφανίζει το διάλογο αν δε μπορεί να βρει ένα σωστό κλειδί ή αν "
-"υπάρχουν πολλά κλειδιά που μπορούν να χρησιμοποιηθούν. </p></qt>"
+"<qt><p>Αν ενεργοποιήσετε αυτή την επιλογή, η εφαρμογή θα σας εμφανίζει πάντα "
+"μια λίστα των δημόσιων κλειδιών από την οποία θα μπορείτε να επιλέγετε αυτό "
+"που θα χρησιμοποιηθεί για την κρυπτογράφηση. Αν είναι απενεργοποιημένη η "
+"επιλογή, η εφαρμογή θα εμφανίζει το διάλογο αν δε μπορεί να βρει ένα σωστό "
+"κλειδί ή αν υπάρχουν πολλά κλειδιά που μπορούν να χρησιμοποιηθούν. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -525,13 +544,11 @@ msgstr "Απομνημόνευση επιλογής"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Αν ενεργοποιήσετε αυτό το πλαίσιο η επιλογή σας θα αποθηκευτεί και δε θα "
-"ερωτηθείτε ξανά.</p></qt>"
+"<qt><p>Αν ενεργοποιήσετε αυτό το πλαίσιο η επιλογή σας θα αποθηκευτεί και δε "
+"θα ερωτηθείτε ξανά.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -630,6 +647,10 @@ msgstr "Επιλογή κλειδιού OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Παρακαλώ επιλέξτε ένα κλειδί OpenPGP για χρήση."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Αλλαγή..."
@@ -694,8 +715,8 @@ msgid ""
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
 msgstr ""
-"Επιλέξτε τα κλειδιά τα οποία πρόκειται να χρησιμοποιηθούν για την κρυπτογράφηση "
-"του μηνύματος προς εσάς."
+"Επιλέξτε τα κλειδιά τα οποία πρόκειται να χρησιμοποιηθούν για την "
+"κρυπτογράφηση του μηνύματος προς εσάς."
 
 #: kpgpui.cpp:1543
 #, c-format
@@ -705,8 +726,8 @@ msgid ""
 "Select the key(s) which should be used to encrypt the message for\n"
 "%1"
 msgstr ""
-"Επιλέξτε τα κλειδιά τα οποία πρόκειται να χρησιμοποιηθούν για την κρυπτογράφηση "
-"του μηνύματος για το\n"
+"Επιλέξτε τα κλειδιά τα οποία πρόκειται να χρησιμοποιηθούν για την "
+"κρυπτογράφηση του μηνύματος για το\n"
 "%1"
 
 #: kpgpui.cpp:1619
diff --git a/tde-i18n-en_GB/messages/tdepim/libkpgp.po b/tde-i18n-en_GB/messages/tdepim/libkpgp.po
index 6bb9f1be134..abbdd170304 100644
--- a/tde-i18n-en_GB/messages/tdepim/libkpgp.po
+++ b/tde-i18n-en_GB/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-01-31 16:16+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,7 +47,7 @@ msgstr "Passphrase is too long, it must contain fewer than 1024 characters."
 msgid "Out of memory."
 msgstr "Out of memory."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -43,16 +55,16 @@ msgstr ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP Warning"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Retry"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -62,11 +74,11 @@ msgstr ""
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Send &Unsigned"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -75,26 +87,26 @@ msgstr ""
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Send &Encrypted"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Send &Unencrypted"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -103,11 +115,11 @@ msgstr ""
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Send As-Is"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -116,7 +128,7 @@ msgstr ""
 "The following error occurred:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -124,7 +136,7 @@ msgstr ""
 "This is the error message of %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -132,15 +144,15 @@ msgstr ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -148,7 +160,7 @@ msgstr ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -156,7 +168,7 @@ msgstr ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -164,17 +176,17 @@ msgstr ""
 "This feature is\n"
 "still missing"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Encryption Key Selection"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -186,7 +198,7 @@ msgstr ""
 "\n"
 "Please re-select the key(s) which should be used for this recipient."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -198,7 +210,7 @@ msgstr ""
 "\n"
 "Select the key(s) which should be used for this recipient."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -256,11 +268,11 @@ msgstr "Bad passphrase; could not sign."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -300,11 +312,11 @@ msgstr "The passphrase you entered is invalid."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -353,7 +365,7 @@ msgstr "Signing failed because your secret key is unusable."
 msgid "Error running gpg"
 msgstr "Error running gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (file ~/.gnupg/pubring.gpg not found)"
 
@@ -369,6 +381,11 @@ msgstr ""
 "Please enter the OpenPGP passphrase for\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP Warning"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -409,33 +426,35 @@ msgstr "PGP Version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Do not use any encryption tool"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Keep passphrase in memory"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -443,17 +462,15 @@ msgstr "Always encr&ypt to self"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -461,17 +478,15 @@ msgstr "&Show signed/encrypted text after composing"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -479,17 +494,17 @@ msgstr "Always show the encryption keys &for approval"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialogue if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialogue if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -509,13 +524,11 @@ msgstr "Remember choice"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>If you tick this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you tick this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -614,6 +627,10 @@ msgstr "OpenPGP Key Selection"
 msgid "Please select an OpenPGP key to use."
 msgstr "Please select an OpenPGP key to use."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Change..."
diff --git a/tde-i18n-es/messages/tdepim/libkpgp.po b/tde-i18n-es/messages/tdepim/libkpgp.po
index dd1a16a2f5e..381e3cc1019 100644
--- a/tde-i18n-es/messages/tdepim/libkpgp.po
+++ b/tde-i18n-es/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-01-21 18:40+0100\n"
 "Last-Translator: Juan Manuel Garcia Molina <juanma@superiodico.net>\n"
 "Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -36,7 +48,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Sin memoria."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -44,30 +56,30 @@ msgstr ""
 "Acaba de introducir una frase de paso no válida.\n"
 "¿Quiere volver a intentarlo o cancelarlo y ver el mensaje descifrado?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Aviso de PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "Volve&r a intentar"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Ha introducido una frase de paso.\n"
-"¿Quiere volver a intentarlo, continuar y dejar el mensaje sin firmar o cancelar "
-"el envío del mensaje?"
+"¿Quiere volver a intentarlo, continuar y dejar el mensaje sin firmar o "
+"cancelar el envío del mensaje?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Enviar s&in firmar"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -76,26 +88,26 @@ msgstr ""
 "%1\n"
 "¿Quiere enviar el mensaje sin firmar o cancelar el envío del mensaje?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"¿Quiere cifrar el mensaje de todos modos, dejar el mensaje tal cual o cancelar "
-"el envío del mensaje?"
+"¿Quiere cifrar el mensaje de todos modos, dejar el mensaje tal cual o "
+"cancelar el envío del mensaje?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "&Enviar sin cifrar"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Enviar s&in cifrar"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -104,11 +116,11 @@ msgstr ""
 "%1\n"
 "¿Quiere dejar el mensaje tal cual o cancelar el envío del mensaje?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Enviar &tal cual"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +129,7 @@ msgstr ""
 "Ocurrió el siguiente error:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,23 +137,23 @@ msgstr ""
 "Éste es el mensaje de error de %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"No ha seleccionado ninguna clave de cifrado para el destinatario del mensaje. "
-"Por tanto, el mensaje no se cifrará."
+"No ha seleccionado ninguna clave de cifrado para el destinatario del "
+"mensaje. Por tanto, el mensaje no se cifrará."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"No ha seleccionado ninguna clave de cifrado para ninguno de los destinatarios "
-"del mensaje. Por tanto, el mensaje no se cifrará."
+"No ha seleccionado ninguna clave de cifrado para ninguno de los "
+"destinatarios del mensaje. Por tanto, el mensaje no se cifrará."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -149,7 +161,7 @@ msgstr ""
 "No ha seleccionado una clave de cifrado para uno de los destinatarios. Esa "
 "persona no podrá descifrar el mensaje si lo cifra."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -157,7 +169,7 @@ msgstr ""
 "No ha seleccionado clave de cifrado para algunos de los destinatarios del "
 "mensaje. Esas personas no podrán descifrar el mensaje si lo cifra."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,16 +177,16 @@ msgstr ""
 "Esta característica aún\n"
 "no está disponible"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "No tiene GnuPG/PGP instalado, o ha elegido no usar GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Selección de clave de cifrado"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -186,7 +198,7 @@ msgstr ""
 "\n"
 "Vuelva a seleccionar las claves que se deban usar para este destinatario."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -197,7 +209,7 @@ msgstr ""
 "No hay ninguna clave OpenPGP válida y de confianza para «%1».\n"
 "Seleccione las claves que se deban usar para este destinatario."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -215,7 +227,8 @@ msgid ""
 "%1;\n"
 "the message is not encrypted."
 msgstr ""
-"No se pudieron encontrar claves públicas con coincidan con los ids. de usuario\n"
+"No se pudieron encontrar claves públicas con coincidan con los ids. de "
+"usuario\n"
 "%1.\n"
 "El mensaje no se cifrará."
 
@@ -225,7 +238,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"No se pudieron encontrar claves públicas que coincidan con los ids. de usuario\n"
+"No se pudieron encontrar claves públicas que coincidan con los ids. de "
+"usuario\n"
 "%1.\n"
 "Esas personas no podrán leer el mensaje."
 
@@ -257,11 +271,11 @@ msgstr "Frase de paso incorrecta. no se pudo firmar."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Fallo al firmar: verifique la identidad de usuario y la configuración de PGP, y "
-"los anillos de claves."
+"Fallo al firmar: verifique la identidad de usuario y la configuración de "
+"PGP, y los anillos de claves."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -302,8 +316,8 @@ msgstr "La frase de paso que introdujo no es válida."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Las claves con las que quiere cifrar el mensaje no son de confianza. No se "
 "cifrará."
@@ -355,7 +369,7 @@ msgstr "Fallo al firmar porque su clave secreta no se puede utilizar."
 msgid "Error running gpg"
 msgstr "Error al hacer funcionar gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (archivo ~/.gnupg/pubring.gpg no encontrado)"
 
@@ -371,13 +385,19 @@ msgstr ""
 "Introduzca la frase de paso OpenPGP para\n"
 "«%1»:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Aviso de PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Verifique que el cifrado realmente funciona antes de empezar a usarlo de veras. "
-"Tenga en cuenta también que los adjuntos no los cifra el módulo PGP/GPG."
+"Verifique que el cifrado realmente funciona antes de empezar a usarlo de "
+"veras. Tenga en cuenta también que los adjuntos no los cifra el módulo PGP/"
+"GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -411,34 +431,35 @@ msgstr "PGP versión 6.x"
 msgid "Do not use any encryption tool"
 msgstr "No usar ninguna herramienta de cifrado"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Mantener la frase de paso en memoria"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cuando esta opción está activada, la frase de paso de su clave privada la "
-"recordará la aplicación mientras esté funcionando. Por tanto, sólo tendrá que "
-"introducir una vez la frase de paso.</p>"
-"<p>Tenga en cuenta que esto podría ser un riesgo de seguridad. Si se aleja de "
-"su ordenador, otras personas pueden usarlo para enviar mensajes cifrados y/o "
-"leer sus mensajes cifrados. Si ocurre un volcado del núcleo, el contenido de su "
-"RAM se almacenará en disco, incluyendo su frase de paso.</p>"
-"<p>Tenga en cuando que, cuando use KMail, esta opción sólo tiene efecto si no "
-"está usando gpg-agent. También se ignorará si está usando extensiones de "
-"cifrado.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Cuando esta opción está activada, la frase de paso de su clave "
+"privada la recordará la aplicación mientras esté funcionando. Por tanto, "
+"sólo tendrá que introducir una vez la frase de paso.</p><p>Tenga en cuenta "
+"que esto podría ser un riesgo de seguridad. Si se aleja de su ordenador, "
+"otras personas pueden usarlo para enviar mensajes cifrados y/o leer sus "
+"mensajes cifrados. Si ocurre un volcado del núcleo, el contenido de su RAM "
+"se almacenará en disco, incluyendo su frase de paso.</p><p>Tenga en cuando "
+"que, cuando use KMail, esta opción sólo tiene efecto si no está usando gpg-"
+"agent. También se ignorará si está usando extensiones de cifrado.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -446,17 +467,15 @@ msgstr "C&ifrar siempre a sí mismo"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cuando esta opción está activada, el mensaje/archivo sólo no sólo se cifrará "
-"con la clave pública del destinatario, sino también con su propia clave. Esto "
-"le permitirá que descifre el mensaje/archivo posteriormente. Suele ser una "
-"buena idea.</p></qt>"
+"<qt><p>Cuando esta opción está activada, el mensaje/archivo sólo no sólo se "
+"cifrará con la clave pública del destinatario, sino también con su propia "
+"clave. Esto le permitirá que descifre el mensaje/archivo posteriormente. "
+"Suele ser una buena idea.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -464,17 +483,15 @@ msgstr "Mo&strar texto firmado/cifrado tras editar"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cuando esta opción está activada, el texto firmado/cifrado se mostrará en "
-"una ventana aparte, permitiéndole saber qué aspecto tendrán antes de que lo "
-"envíe. Es una buena idea cuando quiera comprobar que funciona el sistema de "
-"cifrado.</p></qt>"
+"<qt><p>Cuando esta opción está activada, el texto firmado/cifrado se "
+"mostrará en una ventana aparte, permitiéndole saber qué aspecto tendrán "
+"antes de que lo envíe. Es una buena idea cuando quiera comprobar que "
+"funciona el sistema de cifrado.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -482,18 +499,17 @@ msgstr "Mostrar siempre las claves de ci&frado para su aprobación"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Cuando esta opción está activada, la aplicación siempre le mostrará una "
-"lista de claves públicas, de entre las que puede elegir la que quiere usar para "
-"cifrado. Si está desactivada, la aplicación sólo mostrará el cuadro de diálogo "
-"si no puede encontrar la clave correcta o si hay varias claves que se puedan "
-"usar.</p></qt>"
+"<qt><p>Cuando esta opción está activada, la aplicación siempre le mostrará "
+"una lista de claves públicas, de entre las que puede elegir la que quiere "
+"usar para cifrado. Si está desactivada, la aplicación sólo mostrará el "
+"cuadro de diálogo si no puede encontrar la clave correcta o si hay varias "
+"claves que se puedan usar.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -513,12 +529,10 @@ msgstr "Recordar la elección"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Si marca esta casilla, su elección se almacenará y no se le volverá a "
+"<qt><p>Si marca esta casilla, su elección se almacenará y no se le volverá a "
 "preguntar.</p></qt>"
 
 #: kpgpui.cpp:391
@@ -618,6 +632,10 @@ msgstr "Selección de clave OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Seleccione qué clave OpenPGP usar."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Cambiar..."
@@ -682,7 +700,8 @@ msgid ""
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
 msgstr ""
-"Seleccione las claves que se deban usar para cifrarse el mensaje para sí mismo."
+"Seleccione las claves que se deban usar para cifrarse el mensaje para sí "
+"mismo."
 
 #: kpgpui.cpp:1543
 #, c-format
diff --git a/tde-i18n-et/messages/tdepim/libkpgp.po b/tde-i18n-et/messages/tdepim/libkpgp.po
index 00d0846b13b..87802d1e20f 100644
--- a/tde-i18n-et/messages/tdepim/libkpgp.po
+++ b/tde-i18n-et/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-02-03 20:43+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr "Paroolifraas on liiga pikk, see peab olema vähem kui 1024 märki."
 msgid "Out of memory."
 msgstr "Mälunappus."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,16 +54,16 @@ msgstr ""
 "Sa sisestasid vale paroolifraasi.\n"
 "Kas proovid uuesti või loobud ja vaatad kirja lahti krüptimata?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP hoiatus"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "P&roovi uuesti"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,11 +73,11 @@ msgstr ""
 "Kas proovid uuesti, jätkad ja jätad kirja signeerimata või loobud kirja "
 "saatmisest?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Saada &signeerimata"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -74,25 +86,25 @@ msgstr ""
 "%1\n"
 "Kas soovid saata kirja signeerimata või loobud kirja saatmisest?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Kas krüptida igal juhul, saata nii, nagu on, või loobuda kirja saatmisest?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "&Saada krüptitult"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Saa&da krüptimata"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -101,11 +113,11 @@ msgstr ""
 "%1\n"
 "Soovid sa saata kirja nii, nagu on, või loobud kirja saatmisest?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Saada nagu on"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -114,7 +126,7 @@ msgstr ""
 "Juhtus järgmine viga:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -122,22 +134,23 @@ msgstr ""
 "See on %1 veateade:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Sa ei valinud selle sõnumi saajale krüptovõtit. Seepärast ka kirja ei krüptita."
+"Sa ei valinud selle sõnumi saajale krüptovõtit. Seepärast ka kirja ei "
+"krüptita."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Sa ei valinud ühelegi sõnumi saajale krüptovõtit. Seepärast ka kirja ei "
 "krüptita."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -145,7 +158,7 @@ msgstr ""
 "Sa ei valinud ühele saajatest krüptovõtit. See isik ei suuda kirja lahti "
 "krüptida, kui sa kavatsed selle krüptida."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -153,7 +166,7 @@ msgstr ""
 "Sa ei valinud mõnele saajatest krüptovõtmeid. Need isikud ei suuda kirja "
 "lugeda, kui sa kavatsed selle krüptida."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -161,17 +174,17 @@ msgstr ""
 "Kahjuks seda\n"
 "funktsiooni veel pole"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Sul ei ole GnuPG/PGP paigaldatud või oled valinud selle mittekasutamise."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Krüptovõtme valimine"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -183,7 +196,7 @@ msgstr ""
 "\n"
 "Palun vali uuesti võti (võtmed), mida kasutada antud saaja puhul."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -195,7 +208,7 @@ msgstr ""
 "\n"
 "Vali võti (võtmed), mida kasutada antud saatja puhul."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -233,7 +246,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"Avalikud võtmed ei ole sertifitseeritud usaldusväärse signatuuriga userid(-de)\n"
+"Avalikud võtmed ei ole sertifitseeritud usaldusväärse signatuuriga userid(-"
+"de)\n"
 "%1.\n"
 "jaoks.\n"
 "Kirja ei krüptita."
@@ -244,7 +258,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"Avalikud võtmed ei ole sertifitseeritud usaldusväärse signatuuriga userid(-de)\n"
+"Avalikud võtmed ei ole sertifitseeritud usaldusväärse signatuuriga userid(-"
+"de)\n"
 "%1.\n"
 "jaoks.\n"
 "Need isikud ei suuda kirja lugeda."
@@ -255,8 +270,8 @@ msgstr "Vigane paroolifraas. Signeerimine pole võimalik."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Signeerimine ebaõnnestus. Palun kontrolli oma PGP identiteeti, seadistusi ja "
 "võtmehoidjaid."
@@ -300,11 +315,11 @@ msgstr "Sisestatud paroolifraas on vale."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Võti (võtmed), millega soovid kirja krüptida, pole usaldusväärsed. Krüptimine "
-"jäeti ära."
+"Võti (võtmed), millega soovid kirja krüptida, pole usaldusväärsed. "
+"Krüptimine jäeti ära."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -354,7 +369,7 @@ msgstr "Signeerimine ebaõnnestus, sest sinu salajane võti oli kasutuskõlbmatu
 msgid "Error running gpg"
 msgstr "Viga gpg käivitamisel"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (faili ~/.gnupg/pubring.pgp ei leitud)"
 
@@ -370,14 +385,19 @@ msgstr ""
 "Palun sisesta OpenPGP paroolifraas\n"
 "\"%1\" jaoks:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP hoiatus"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Palun kontrolli enne krüptimise tõsisemalt kasutama asumist, et see ka "
-"tegelikult töötaks. Samuti ära unusta, et PGP/GPG moodul ei krüpti kaasa pandud "
-"faile."
+"tegelikult töötaks. Samuti ära unusta, et PGP/GPG moodul ei krüpti kaasa "
+"pandud faile."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -411,31 +431,33 @@ msgstr "PGP versioon 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Ühtegi krüptimisvahendit ei kasutata"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Parool jäetakse meelde"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Selle valimisel jätab rakendus enda töö ajaks meelde sinu eravõtme "
-"paroolifraasi, nii et sul on vaja see vaid üks kord sisestada.</p>"
-"<p>Arvesta, et see kujutab endast teatud turvariski. Kui lahkud arvuti juurest, "
-"on teistel võimalik kasutada seda signeeritud kirjade saatmiseks ja/või sinu "
-"krüptitud kirjade lugemiseks. Kui peaks juhtuma tõsine krahh, salvestatakse "
-"püsimälu kettale, sealhulgas ka sinu paroolifraas.</p>"
-"<p>Pane tähele, et KMaili kasutades kehtib see ainult juhul, kui sul ei ole "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Selle valimisel jätab rakendus enda töö ajaks meelde sinu eravõtme "
+"paroolifraasi, nii et sul on vaja see vaid üks kord sisestada.</"
+"p><p>Arvesta, et see kujutab endast teatud turvariski. Kui lahkud arvuti "
+"juurest, on teistel võimalik kasutada seda signeeritud kirjade saatmiseks ja/"
+"või sinu krüptitud kirjade lugemiseks. Kui peaks juhtuma tõsine krahh, "
+"salvestatakse püsimälu kettale, sealhulgas ka sinu paroolifraas.</p><p>Pane "
+"tähele, et KMaili kasutades kehtib see ainult juhul, kui sul ei ole "
 "kasutusel gpg-agent. Seda ignoreeritakse ka siis, kui kasutad "
 "krüptopluginaid.</p></qt>"
 
@@ -445,16 +467,14 @@ msgstr "Enda jaoks krüptitakse &alati"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selle valimisel ei krüptita kirja/faili mitte ainult saaja avaliku võtmega, "
-"vaid ka sinu võtmega. See lubab sul kirja/faili hiljem lahti krüptida. Enamasti "
-"on see mõistlik käitumisviis.</p></qt>"
+"<qt><p>Selle valimisel ei krüptita kirja/faili mitte ainult saaja avaliku "
+"võtmega, vaid ka sinu võtmega. See lubab sul kirja/faili hiljem lahti "
+"krüptida. Enamasti on see mõistlik käitumisviis.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -462,16 +482,14 @@ msgstr "&Signeeritud/krüptitud teksti näidatakse pärast koostamist"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selle valimisel näidatakse signeeritud/krüptitud teksti eraldi aknas, mis "
-"laseb sul enne ärasaatmist vaadata, milline kõik välja paistab. See on päris "
-"mõistlik näiteks kontrollimaks, et krüptimine ikka toimib.</p></qt>"
+"<qt><p>Selle valimisel näidatakse signeeritud/krüptitud teksti eraldi aknas, "
+"mis laseb sul enne ärasaatmist vaadata, milline kõik välja paistab. See on "
+"päris mõistlik näiteks kontrollimaks, et krüptimine ikka toimib.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -479,17 +497,16 @@ msgstr "Alati näidatakse kinnitamiseks krüpto&võtmeid"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Selle valimisel näitab rakendus alati avalike võtmete nimekirja, kust saab "
-"valida selle, mida krüptimiseks kasutada. Kui see ei ole valitud, näitab "
-"rakendus dialoogi ainult siis, kui õiget võtit ei leita või kui valida on mitme "
-"võtme vahel.</p></qt>"
+"<qt><p>Selle valimisel näitab rakendus alati avalike võtmete nimekirja, kust "
+"saab valida selle, mida krüptimiseks kasutada. Kui see ei ole valitud, "
+"näitab rakendus dialoogi ainult siis, kui õiget võtit ei leita või kui "
+"valida on mitme võtme vahel.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -509,13 +526,11 @@ msgstr "Valik jäetakse meelde"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Selle kasti märkimisel salvestatakse sinu valik ega küsita seda enam.</p>"
-"</qt>"
+"<qt><p>Selle kasti märkimisel salvestatakse sinu valik ega küsita seda enam."
+"</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -614,6 +629,10 @@ msgstr "OpenPGP võtme valik"
 msgid "Please select an OpenPGP key to use."
 msgstr "Palun vali kasutatav OpenPGP võti."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Muuda..."
diff --git a/tde-i18n-eu/messages/tdepim/libkpgp.po b/tde-i18n-eu/messages/tdepim/libkpgp.po
index d21ca20e3dc..c9506065bd7 100644
--- a/tde-i18n-eu/messages/tdepim/libkpgp.po
+++ b/tde-i18n-eu/messages/tdepim/libkpgp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-06-16 18:04+0200\n"
 "Last-Translator: Marcos Goienetxe <marcos@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -37,7 +49,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Memoriarik gabe."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -45,16 +57,16 @@ msgstr ""
 "Pasa-esaldi baliogabe bat sartu duzu.\n"
 "Berriro saiatu edo ezeztatu eta mezua desenkriptatuta ikusi nahi duzu?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP abisua"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Berriro saiatu"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -64,11 +76,11 @@ msgstr ""
 "Berriro saiatu, jarraitu eta mezua sinatu gabe utzi nahi duzu, edo mezuaren "
 "bidalketa ezeztatu nahi duzu?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Bidali sinatu &gabe"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -77,26 +89,26 @@ msgstr ""
 "%1\n"
 "Mezua sinatu gabe bidali nahi duzu edo mezuaren bidalketa ezeztatu nahi duzu?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Dena den enkriptatu nahi duzu, mezua dagoen bezala utzi, edo mezuaren bidalketa "
-"ezeztatu nahi duzu?"
+"Dena den enkriptatu nahi duzu, mezua dagoen bezala utzi, edo mezuaren "
+"bidalketa ezeztatu nahi duzu?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Bidali &enkriptatuta"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Bidali &enkriptatu gabe"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -105,11 +117,11 @@ msgstr ""
 "%1\n"
 "Mezua dagoen bezala utzi, edo mezuaren bidalketa ezeztatu nahi duzu?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Bidali dagoen bezala"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -118,7 +130,7 @@ msgstr ""
 "Ondorengo errorea gertatu da:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -126,7 +138,7 @@ msgstr ""
 "Hau %1-(r)en errore mezua da:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -134,23 +146,23 @@ msgstr ""
 "Ez duzu mezu honen hartzailearentzat enkriptatzeko gakorik hautatu; beraz, "
 "mezua ez da enkriptatuko."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Ez duzu mezu honen hartzaileentzat enkriptatzeko gakorik hautatu; beraz, mezua "
-"ez da enkriptatuko."
+"Ez duzu mezu honen hartzaileentzat enkriptatzeko gakorik hautatu; beraz, "
+"mezua ez da enkriptatuko."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Ez duzu mezu honen hartzaile batentzat enkriptatzeko gakorik hautatu; pertsona "
-"honek ezin izango du mezua desenkriptatu mezu enkriptatzen baduzu."
+"Ez duzu mezu honen hartzaile batentzat enkriptatzeko gakorik hautatu; "
+"pertsona honek ezin izango du mezua desenkriptatu mezu enkriptatzen baduzu."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -158,7 +170,7 @@ msgstr ""
 "Ez duzu mezu honen hartzaile batzuentzat enkriptatzeko gakorik hautatu; "
 "pertsona hauek ezin izango dute mezua desenkriptatu mezu enkriptatzen baduzu."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -166,17 +178,17 @@ msgstr ""
 "Eginbide hau falta\n"
 "da oraindik."
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Ez duzu GnuPG/PGP instalatuta edo GnuPG/PGP ez erabiltzea hautatu duzu."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Enkriptatzeko gakoaren hautapena"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,7 +200,7 @@ msgstr ""
 "\n"
 "Berriro hautatu hartzaile honekin erabili beharko liratekeen gakoak."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -200,7 +212,7 @@ msgstr ""
 "\n"
 "Hautatu hartzaile honekin erabili beharko liratekeen gakoak."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -260,8 +272,8 @@ msgstr "Pasa-esaldi baliogabea; ezin da sinatu."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Sinadurak huts egin du; egiaztatu zure PGP erabiltzaile identitatea, PGP-ren "
 "konfigurazioa eta gakoaren erantzunak."
@@ -269,8 +281,8 @@ msgstr ""
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
 msgstr ""
-"Enkriptazioak huts egin du: egiaztatu zure PGP-ren konfigurazioa eta gakoaren "
-"eraztunak."
+"Enkriptazioak huts egin du: egiaztatu zure PGP-ren konfigurazioa eta "
+"gakoaren eraztunak."
 
 #: kpgpbase2.cpp:259 kpgpbase6.cpp:62 kpgpbase6.cpp:360
 msgid "error running PGP"
@@ -306,11 +318,11 @@ msgstr "Sartu duzun pasa-esaldia baliogabea da."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Zure mezua enkriptatzeko erabili nahi duzun gakoak ez dira konfidantzazkoak. Ez "
-"da enkriptatuko."
+"Zure mezua enkriptatzeko erabili nahi duzun gakoak ez dira konfidantzazkoak. "
+"Ez da enkriptatuko."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -359,7 +371,7 @@ msgstr "Sinadurak huts egin du zure gako sekretua erabilgaitza delako."
 msgid "Error running gpg"
 msgstr "Errore gpg exekutatzean"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (~/.gnupg/pubring.gpg fitxategia ez da aurkitu)"
 
@@ -373,6 +385,11 @@ msgid ""
 "\"%1\":"
 msgstr "Sartu \"%1\"-(r)en OpenPGP pasa-esaldia:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP abisua"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -413,35 +430,36 @@ msgstr "PGP 6.x bertsioa"
 msgid "Do not use any encryption tool"
 msgstr "Ez erabili enkriptatzeko tresnarik"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Mantendu pasa-esaldia memorian"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Aukera hau gaitzen baduzu, aplikazioak, martxan dagoen bitartean, zure gako "
-"pribatuaren pasa-esaldia gogoratuko du. Beraz, pasa-esaldia behin bakarrik "
-"sartuko duzu.</p> "
-"<p>Kontuan hartu hau segurtasunerako arrisku bat izan daitekeela. Zure "
-"ordenagailua bakarrik uzten baduzu, besteek sinatutako mezuak bidali eta/edo "
-"zure enkriptatutako mezuak irakurri ahal izango dituzte. Nukleoaren iraulketa "
-"bat gertatzen bada, zure RAM-aren edukinak, pasa-esaldia barne, diskan gordeko "
-"dira.</p>"
-"<p>Kontuan izan KMail erailtzean, ezarpen hau gpg-agent erabiltzen ari ez "
-"bazara bakarrik aplikatuko dela. Kriptografia plugin-ak erabiltzen ari bazara, "
-"ezarpen honi ezikusia egingo zaio.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Aukera hau gaitzen baduzu, aplikazioak, martxan dagoen bitartean, "
+"zure gako pribatuaren pasa-esaldia gogoratuko du. Beraz, pasa-esaldia behin "
+"bakarrik sartuko duzu.</p> <p>Kontuan hartu hau segurtasunerako arrisku bat "
+"izan daitekeela. Zure ordenagailua bakarrik uzten baduzu, besteek sinatutako "
+"mezuak bidali eta/edo zure enkriptatutako mezuak irakurri ahal izango "
+"dituzte. Nukleoaren iraulketa bat gertatzen bada, zure RAM-aren edukinak, "
+"pasa-esaldia barne, diskan gordeko dira.</p><p>Kontuan izan KMail "
+"erailtzean, ezarpen hau gpg-agent erabiltzen ari ez bazara bakarrik "
+"aplikatuko dela. Kriptografia plugin-ak erabiltzen ari bazara, ezarpen honi "
+"ezikusia egingo zaio.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -449,15 +467,13 @@ msgstr "Beti bere &burua enkriptatu"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Aukera hau gaituta dagoenean, mezua/fitxategia ez da hartzailearen gako "
-"publikoarekin bakarrik enkriptatuko, baita zure gakoarekin ere. Honek "
+"<qt><p>Aukera hau gaituta dagoenean, mezua/fitxategia ez da hartzailearen "
+"gako publikoarekin bakarrik enkriptatuko, baita zure gakoarekin ere. Honek "
 "beranduago zure mezua/fitxaegia desenkriptatzeko aukera emango dizu. Hau "
 "orokorrean ideia hona da.</p></qt>"
 
@@ -467,17 +483,15 @@ msgstr "&Erakutsi sinatutako/enkriptatutako testua editatu ondoren"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p> Aukera hau gaituta dagoenean, sinatutako/enkriptatutako testua lehio "
-"banandu batean erakutsiko da, bidali aurretik zein itxura edukiko duen jakiteko "
-"aukera izan dezazun. Hau idea ona da zure enkriptazio sistema ongi dabilen "
-"egiaztatzea nahi baduzu.</p></qt>"
+"<qt><p> Aukera hau gaituta dagoenean, sinatutako/enkriptatutako testua lehio "
+"banandu batean erakutsiko da, bidali aurretik zein itxura edukiko duen "
+"jakiteko aukera izan dezazun. Hau idea ona da zure enkriptazio sistema ongi "
+"dabilen egiaztatzea nahi baduzu.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -485,17 +499,17 @@ msgstr "Beti erakutsi enkriptatzeko gakoak, berresteko."
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Aukera hau gaituta dagoenean, aplikazioak beti enkriptazioan erabiltzeko "
-"gakoa hautatzeko gako publikoen zerrenda bat erakutsiko du. Ezgaituta badago, "
-"aplikazioak gako zuzena aurkitzen ez badu edo erabilgarriak diren gako bat "
-"baina gehiago badago bakarrik bistaratuko du elkarrizketa-koadro hau. </p></qt>"
+"<qt><p>Aukera hau gaituta dagoenean, aplikazioak beti enkriptazioan "
+"erabiltzeko gakoa hautatzeko gako publikoen zerrenda bat erakutsiko du. "
+"Ezgaituta badago, aplikazioak gako zuzena aurkitzen ez badu edo "
+"erabilgarriak diren gako bat baina gehiago badago bakarrik bistaratuko du "
+"elkarrizketa-koadro hau. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -515,12 +529,10 @@ msgstr "Gogoratu aukera"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kaxa hau hautatzen baduzu, zure aukera gordeko da eta ez berriz "
+"<qt><p>Kaxa hau hautatzen baduzu, zure aukera gordeko da eta ez berriz "
 "galdetuko.</p></qt>"
 
 #: kpgpui.cpp:391
@@ -620,6 +632,10 @@ msgstr "OpenPGP gakoaren hautapena"
 msgid "Please select an OpenPGP key to use."
 msgstr "Hautatu erabiltzeko OpenPGP gakoa."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Aldatu..."
diff --git a/tde-i18n-fa/messages/tdepim/libkpgp.po b/tde-i18n-fa/messages/tdepim/libkpgp.po
index 78452ea01dc..4a659613c43 100644
--- a/tde-i18n-fa/messages/tdepim/libkpgp.po
+++ b/tde-i18n-fa/messages/tdepim/libkpgp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-01-01 11:42+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -17,6 +17,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -37,7 +49,7 @@ msgstr "عبارت عبور خیلی طولانی است. باید کمتر از
 msgid "Out of memory."
 msgstr "خارج از حافظه‌."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -45,16 +57,16 @@ msgstr ""
 "یک عبارت عبور نامعتبر وارد کردید.\n"
 "می‌خواهید دوباره سعی کنید، یا لغو کرده و پیام سرگشایی‌نشده را مشاهده می‌کنید؟"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "اخطار PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&سعی مجدد‌"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -64,11 +76,11 @@ msgstr ""
 "می‌خواهید دوباره سعی کرده، ادامه دهید و پیام امضانشده را ترک کنید، یا ارسال "
 "پیام را لغو می‌کنید؟"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "ارسال &امضانشده‌"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -77,26 +89,26 @@ msgstr ""
 "%1\n"
 "می‌خواهید پیام امضانشده را ارسال کنید، یا ارسال پیام را لغو می‌کنید؟"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "می‌خواهید به هر صورت رمزبندی کرده و پیام را همان‌طور که هست رها کنید، یا ارسال "
 "را لغو می‌کنید؟"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "ارسال &رمزبندی‌شده‌"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "ارسال &رمزبندی‌نشده‌"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -105,11 +117,11 @@ msgstr ""
 "%1\n"
 "می‌خواهید پیام را همان‌طور که هست ترک کنید، یا ارسال پیام را لغو می‌کنید؟"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&ارسال همان‌طور که هست‌"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -118,7 +130,7 @@ msgstr ""
 "خطای زیر رخ داد:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -126,7 +138,7 @@ msgstr ""
 "این پیام خطای %1 است:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -134,15 +146,15 @@ msgstr ""
 "برای دریافت این پیام، کلید رمزبندی انتخاب نکردید؛ بنابراین، پیام رمزبندی "
 "نمی‌شود."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"برای هر کدام از دریافتهای این پیام، کلید رمزبندی انتخاب نکردید؛ بنابراین، پیام "
-"رمزبندی نمی‌شود."
+"برای هر کدام از دریافتهای این پیام، کلید رمزبندی انتخاب نکردید؛ بنابراین، "
+"پیام رمزبندی نمی‌شود."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -150,7 +162,7 @@ msgstr ""
 "کلید رمزبندی را برای یکی ازگیرنده‌ها انتخاب نکردید؛ این شخص نمی‌تواند پیامی که "
 "شما رمزبندی کرده‌اید را سرگشایی کند."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -158,7 +170,7 @@ msgstr ""
 "کلیدهای رمزبندی را برای برخی از گیرنده‌ها انتخاب نکردید؛ این اشخاص نمی‌توانند "
 "پیامی که شما رمزبندی کرده‌اید را سرگشایی کنند."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -166,17 +178,17 @@ msgstr ""
 "این ویژگی \n"
 "هنوز مفقود است"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "یا  GnuPG/PGP نصب‌شده ندارید، یا عدم استفاده از  GnuPG/PGP را انتخاب کرده‌اید."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "گزینش کلید رمزبندی"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,7 +200,7 @@ msgstr ""
 "\n"
 "لطفاً، کلید)هایی( که باید برای این گیرنده استفاده شوند را دوباره برگزینید."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -200,7 +212,7 @@ msgstr ""
 "\n"
 "کلید)هایی( که باید برای این گیرنده استفاده شوند را برگزینید."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -258,8 +270,8 @@ msgstr "عبارت عبور بد؛ نمی‌توان امضا کرد."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "خرابی در امضا: لطفاً، هویت کاربر PGP، برپایی،PGP  و حلقه‌های کلید خود را بررسی "
 "کنید."
@@ -302,8 +314,8 @@ msgstr "عبارت عبوری که وارد کردید نامعتبر است."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "کلید)هایی( که می‌خواهید پیام خود را با آن رمزبندی کنید، معتبر نیست. رمزبندی "
 "صورت نگرفت."
@@ -355,7 +367,7 @@ msgstr "امضا، به علت بی‌مصرف بودن کلید سرّی شما
 msgid "Error running gpg"
 msgstr "خطای اجرای gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "؟؟؟ )پروندۀ ~/.gnupg/pubring.gpg یافت نشد("
 
@@ -371,6 +383,11 @@ msgstr ""
 "لطفاً، عبارت عبور OpenPGP خود را برای\n"
 "»%1« وارد کنید:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "اخطار PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -411,34 +428,35 @@ msgstr "PGP نسخۀ ۶.x"
 msgid "Do not use any encryption tool"
 msgstr "از هیچ ابزار رمزبندی استفاده نکنید"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&نگه داشتن عبارت عبور در حافظه‌"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>در صورت فعال‌سازی این گزینه، عبارت عبور کلید خصوصی شما با کاربردی که هم‌ "
-"اندازۀ کاربرد در حال اجرا می‌باشد، یادآوری می‌شود. بنابراین، باید فقط یک بار "
-"عبارت عبور را وارد کنید.</p>"
-"<p>توجه داشته باشید که این یک ریسک امنیتی است. اگر رایانۀ خود را ترک کنید، "
-"دیگران می‌توانند از آن برای ارسال پیامهای امضا شده استفاده کرده و/یا پیامهای "
-"رمزبندی‌شدۀ شما را بخوانند. اگر تخلیۀ هسته رخ دهد، محتوای حافظۀ خواندنی-نوشتنی "
-"شما در دیسک ذخیره می‌شود، که عبارت عبور شما را هم در بر می‌گیرد.</p>"
-"<p>توجه داشته باشید که هنگام استفاده از KMail، این تنظیم فقط در صورتی اعمال "
-"می‌شود که از عامل gpg استفاده نمی‌کنید. همچنین، اگر از وصله‌های رمز استفاده "
-"می‌کنید، نادیده گرفته می‌شود.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>در صورت فعال‌سازی این گزینه، عبارت عبور کلید خصوصی شما با کاربردی که "
+"هم‌ اندازۀ کاربرد در حال اجرا می‌باشد، یادآوری می‌شود. بنابراین، باید فقط یک "
+"بار عبارت عبور را وارد کنید.</p><p>توجه داشته باشید که این یک ریسک امنیتی "
+"است. اگر رایانۀ خود را ترک کنید، دیگران می‌توانند از آن برای ارسال پیامهای "
+"امضا شده استفاده کرده و/یا پیامهای رمزبندی‌شدۀ شما را بخوانند. اگر تخلیۀ هسته "
+"رخ دهد، محتوای حافظۀ خواندنی-نوشتنی شما در دیسک ذخیره می‌شود، که عبارت عبور "
+"شما را هم در بر می‌گیرد.</p><p>توجه داشته باشید که هنگام استفاده از KMail، "
+"این تنظیم فقط در صورتی اعمال می‌شود که از عامل gpg استفاده نمی‌کنید. همچنین، "
+"اگر از وصله‌های رمز استفاده می‌کنید، نادیده گرفته می‌شود.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -446,16 +464,14 @@ msgstr "&رمزبندی همیشگی برای خود‌"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>در صورت فعال بودن این گزینه، پیام/پرونده نه تنها با کلید عمومی گیرنده، بلکه "
-"با کلید شما رمزبندی می‌شود. می‌توانید بعداً پیام/پرونده را سرگشایی کنید. "
-"معمولاً، ایدۀ خوبی است.</p></qt>"
+"<qt><p>در صورت فعال بودن این گزینه، پیام/پرونده نه تنها با کلید عمومی "
+"گیرنده، بلکه با کلید شما رمزبندی می‌شود. می‌توانید بعداً پیام/پرونده را سرگشایی "
+"کنید. معمولاً، ایدۀ خوبی است.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -463,16 +479,14 @@ msgstr "&نمایش متن امضا‌شده/رمزبندی‌شده پس از �
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>در صورت فعال بودن این گزینه، متن امضا/رمزبندی‌شده در یک پنجرۀ مجزا نمایش "
-"داده می‌شود و شما می‌توانید ظاهر آن را پیش از ارسال ببینید. این کار هنگامی مفید "
-"است که عملکرد سیستم رمزبندی خود را وارسی می‌کنید.</p></qt>"
+"<qt><p>در صورت فعال بودن این گزینه، متن امضا/رمزبندی‌شده در یک پنجرۀ مجزا "
+"نمایش داده می‌شود و شما می‌توانید ظاهر آن را پیش از ارسال ببینید. این کار "
+"هنگامی مفید است که عملکرد سیستم رمزبندی خود را وارسی می‌کنید.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -480,17 +494,16 @@ msgstr "نمایش همیشگی کلیدهای رمزبندی &برای تصوی
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>هنگامی که این گزینه فعال است، همیشه کاربرد فهرستی از کلیدهای عمومی را نمایش "
-"می‌دهد، و می‌توانید کلید عمومی که برای رمزبندی استفاده می‌شود را از آن انتخاب "
-"کنید. در صورت خاموش بودن، اگر کاربرد کلید درست را پیدا نکند یا اگر چندین کلید "
-"قابل استفاده وجود داشته باشد، فقط محاوره را نمایش می‌دهد. </p></qt>"
+"<qt><p>هنگامی که این گزینه فعال است، همیشه کاربرد فهرستی از کلیدهای عمومی را "
+"نمایش می‌دهد، و می‌توانید کلید عمومی که برای رمزبندی استفاده می‌شود را از آن "
+"انتخاب کنید. در صورت خاموش بودن، اگر کاربرد کلید درست را پیدا نکند یا اگر "
+"چندین کلید قابل استفاده وجود داشته باشد، فقط محاوره را نمایش می‌دهد. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -510,13 +523,11 @@ msgstr "یادآوری انتخاب"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>اگر این جعبه را علامت بزنید، انتخاب شما ذخیره شده و دوباره سؤال نمی‌شو‌د.</p>"
-"</qt>"
+"<qt><p>اگر این جعبه را علامت بزنید، انتخاب شما ذخیره شده و دوباره سؤال "
+"نمی‌شو‌د.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -615,6 +626,10 @@ msgstr "گزینش کلید OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "لطفاً، کلید OpenPGP را برای استفاده برگزینید."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "تغییر..."
diff --git a/tde-i18n-fi/messages/tdepim/libkpgp.po b/tde-i18n-fi/messages/tdepim/libkpgp.po
index 05f1e2ffdd3..b06ceb065f6 100644
--- a/tde-i18n-fi/messages/tdepim/libkpgp.po
+++ b/tde-i18n-fi/messages/tdepim/libkpgp.po
@@ -4,17 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2006-01-17 22:55+0200\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
-"Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>>"
-"\n"
+"Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge."
+"net>>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,7 +47,7 @@ msgstr "Salasanafraasi on liian pitkä. Se ei saa olla yli 1023 merkkiä pitkä.
 msgid "Out of memory."
 msgstr "Muisti loppui kesken."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -44,16 +56,16 @@ msgstr ""
 "Haluatko yrittää uudelleen vai keskeyttää ja katsoa viestin selväkielelle "
 "kääntämättömänä?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP Varoitus"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Uudelleen"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -63,39 +75,40 @@ msgstr ""
 "Haluatko yrittää uudelleen jatkaen ja jättäen viestin allekirjoittamatta vai "
 "keskeyttää viestin lähetyksen?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Lähetä &allekirjoittamatta"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Haluatko lähettää viestin allekirjoittamatta vai keskeyttää viestin lähetyksen?"
+"Haluatko lähettää viestin allekirjoittamatta vai keskeyttää viestin "
+"lähetyksen?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Haluatko salata joka tapauksessa, lähettää viestin sellaisenaan vai keskeyttää "
-"viestin lähetyksen?"
+"Haluatko salata joka tapauksessa, lähettää viestin sellaisenaan vai "
+"keskeyttää viestin lähetyksen?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Lähetä &salattuna"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Lähetä sa&laamattomana"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -104,11 +117,11 @@ msgstr ""
 "%1\n"
 "Haluatko lähettää viestin sellaisenaan vai keskeyttää viestin lähetyksen?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Lähetä &sellaisenaan"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +130,7 @@ msgstr ""
 "Tapahtui virhe:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,37 +138,37 @@ msgstr ""
 "Tämä on %1:n virheilmoitus:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr "Et valinnut viestin saajan salausavainta; siksi viestiä ei salata."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Et valinnut kenenkään tämän viestin saajalle salausavainta; siksi viestiä ei "
 "salata."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Et ole valinnut salausavainta yhdelle viestin saajalle. Jos salaat viestin, hän "
-"ei voi purkaa viestin salausta."
+"Et ole valinnut salausavainta yhdelle viestin saajalle. Jos salaat viestin, "
+"hän ei voi purkaa viestin salausta."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Et ole valinnut salausavainta joillekin viestin saajille. Jos salaat viestin, "
-"he eivät voi purkaa viestin salausta."
+"Et ole valinnut salausavainta joillekin viestin saajille. Jos salaat "
+"viestin, he eivät voi purkaa viestin salausta."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -163,18 +176,18 @@ msgstr ""
 "Tämä ominaisuus\n"
 "puuttuu yhä"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Järjestelmään ei ole asennettu GnuPG/PGP:tä tai et ole valinnut sitä "
 "käytettäväksi."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Salausavaimen valinta"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -186,7 +199,7 @@ msgstr ""
 "\n"
 "Valitse uudelleen avaimet, joita käytetään tälle vastaanottajalle."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -198,7 +211,7 @@ msgstr ""
 "\n"
 "Valitse tälle vastaanottajalle käytettävät avaimet."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -258,8 +271,8 @@ msgstr "Huono salasanafraasi, ei voitu allekirjoittaa."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Allekirjoitus epäonnistui: tarkista PGP-käyttäjätiedot, PGP-asetukset ja "
 "avainrenkaat."
@@ -304,8 +317,8 @@ msgstr "Antamasi salasanafraasi on epäkelpo."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Avaimet ovat luottamattomia, joilla haluat saäata viestin. Salausta ei ole "
 "tehty."
@@ -358,7 +371,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "Virhe gpg-ohjelman käytössä"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (tiedostoa ~/.gnupg/pubring.gpg ei löydy)"
 
@@ -374,6 +387,11 @@ msgstr ""
 "Anna OpenPGP salasanafraasisi kohteelle\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP Varoitus"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -414,34 +432,35 @@ msgstr "PGP versio 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Älä käytä mitään salaustyökalua"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Säilytä salasanafraasi muistissa"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kun tämä valinta on valittuna, ohjelma muistaa salasanafraasisi salaiselle "
-"avaimellesi niin kauan kun ohjelma on käynnissä. Sinun tarvitsee antaa "
-"salasanafraasi vain kerran.</p>"
-"<p>Varmistu, sillä tämä voi olla tietoturvauhka. Jos poistut tietokoneeltasi, "
-"kuka tahansa voi käyttää sitä lähettämällä allekirjoitettuja viestejä ja/tai "
-"lukea (vastaanotettuja) salattuja viestejäsi. Jos ohjelma kaatuu core dumppiin, "
-"RAM-muistin sisältö talletetaan levylle sisältäen salasanafraasisi.</p>"
-"<p>Huomaa, että kun käytät KMai-ohjelmaa, tämä valinta toimii ainoastaan, jos "
-"et käytä gpg-agenttia. Valinta ohitetaan, jos käytät salausliitännäisiä.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Kun tämä valinta on valittuna, ohjelma muistaa salasanafraasisi "
+"salaiselle avaimellesi niin kauan kun ohjelma on käynnissä. Sinun tarvitsee "
+"antaa salasanafraasi vain kerran.</p><p>Varmistu, sillä tämä voi olla "
+"tietoturvauhka. Jos poistut tietokoneeltasi, kuka tahansa voi käyttää sitä "
+"lähettämällä allekirjoitettuja viestejä ja/tai lukea (vastaanotettuja) "
+"salattuja viestejäsi. Jos ohjelma kaatuu core dumppiin, RAM-muistin sisältö "
+"talletetaan levylle sisältäen salasanafraasisi.</p><p>Huomaa, että kun "
+"käytät KMai-ohjelmaa, tämä valinta toimii ainoastaan, jos et käytä gpg-"
+"agenttia. Valinta ohitetaan, jos käytät salausliitännäisiä.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -449,15 +468,13 @@ msgstr "&Salaa aina myös oma kopio"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tällä valinnalla viestiä/tiedostoa ei salata ainoastaan saajan julkisella "
-"avaimella, mutta myös sinun avaimella. Tämä mahdollistaa sinulle "
+"<qt><p>Tällä valinnalla viestiä/tiedostoa ei salata ainoastaan saajan "
+"julkisella avaimella, mutta myös sinun avaimella. Tämä mahdollistaa sinulle "
 "viestin/tiedoston salauksen purkamisen jälkeenpäin. Tämä on yleisesti hyvä "
 "idea.</p></qt>"
 
@@ -467,16 +484,14 @@ msgstr "Näytä allekirjoitettu/salattu teksti laatimisen jälkeen"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Tällä valinnalla allekirjoitettu/salattu teksti näytetään erillisessä "
-"ikkunassa. Voit nähdä, miltä se näyttää ennen lähetystä. Tämä on hyvä idea kun "
-"varmistat, että salaus toimii järjestelmässäsi.</p></qt>"
+"<qt><p>Tällä valinnalla allekirjoitettu/salattu teksti näytetään erillisessä "
+"ikkunassa. Voit nähdä, miltä se näyttää ennen lähetystä. Tämä on hyvä idea "
+"kun varmistat, että salaus toimii järjestelmässäsi.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -484,17 +499,16 @@ msgstr "&Näytä aina salausavaimet arviointia varten"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Tällä valinnalla sovellus näyttää aina luettelon julkisista avaimista, "
-"joista voit valita jonkun käytettäväksi salauksessa.  Jos tämä ei ole "
-"valittuna, sovellus näyttää vain valintaikkunan, jos se ei löydä oikeaa avainta "
-"tai jos on useita käytettäviä avaimia. </p></qt>"
+"<qt><p>Tällä valinnalla sovellus näyttää aina luettelon julkisista "
+"avaimista, joista voit valita jonkun käytettäväksi salauksessa.  Jos tämä ei "
+"ole valittuna, sovellus näyttää vain valintaikkunan, jos se ei löydä oikeaa "
+"avainta tai jos on useita käytettäviä avaimia. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -514,13 +528,11 @@ msgstr "Muista valinta"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jos valitset tämän, valintasi talletetaan ja sinulta ei kysytä sitä enää "
-"uudelleen.</p></qt>"
+"<qt><p>Jos valitset tämän, valintasi talletetaan ja sinulta ei kysytä sitä "
+"enää uudelleen.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -619,6 +631,10 @@ msgstr "OpenPGP avaimen valinta"
 msgid "Please select an OpenPGP key to use."
 msgstr "Valitse käytettävä OpenPGP-avain."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Vaihda..."
diff --git a/tde-i18n-fr/messages/tdepim/libkpgp.po b/tde-i18n-fr/messages/tdepim/libkpgp.po
index 519b9872dd7..a5e1c9701d4 100644
--- a/tde-i18n-fr/messages/tdepim/libkpgp.po
+++ b/tde-i18n-fr/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2008-08-15 17:29+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -37,7 +49,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Mémoire insuffisante."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -45,16 +57,16 @@ msgstr ""
 "Vous avez saisi une phrase de passe non valable.\n"
 "Voulez-vous réessayer ou annuler et voir le message non chiffré ?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Avertissement de PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Réessayer"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -64,11 +76,11 @@ msgstr ""
 "Voulez-vous réessayer, continuer et laisser le message non signé ou annuler "
 "l'envoi du message ?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Envo&yer non signé"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -78,26 +90,26 @@ msgstr ""
 "Voulez-vous envoyer en laissant le message non signé ou annuler l'envoi du "
 "message ?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Voulez-vous chiffrer tout de même, laisser le message tel quel, ou annuler "
 "l'envoi du message ?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Envoyer &chiffré"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Envoyer n&on chiffré"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -106,11 +118,11 @@ msgstr ""
 "%1\n"
 "Voulez-vous laisser le message tel quel, ou annuler l'envoi du message ?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Envo&yer tel quel"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -119,7 +131,7 @@ msgstr ""
 "Le problème suivant est survenu :\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -127,7 +139,7 @@ msgstr ""
 "Voici le message d'erreur de %1 :\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -135,15 +147,15 @@ msgstr ""
 "Vous n'avez pas sélectionné de clé de chiffrement pour le destinataire de ce "
 "message. Par conséquent, le message ne sera pas chiffré."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Vous n'avez sélectionné de clé de chiffrement pour aucun des destinataires de "
-"ce message. Par conséquent, le message ne sera pas chiffré."
+"Vous n'avez sélectionné de clé de chiffrement pour aucun des destinataires "
+"de ce message. Par conséquent, le message ne sera pas chiffré."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -151,7 +163,7 @@ msgstr ""
 "Vous n'avez pas sélectionné de clé de chiffrage pour l'un des destinataires. "
 "Cette personne ne pourra donc pas déchiffrer le message si vous le chiffrez."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -159,24 +171,24 @@ msgstr ""
 "Vous n'avez pas sélectionné de clé de chiffrage pour certains destinataires. "
 "Ces personnes ne pourront donc pas déchiffrer le message si vous le chiffrez."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr "Cette fonction n'est pas encore disponible."
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Soit vous n'avez pas installé GnuPG/PGP, soit vous avez choisi de ne pas les "
 "utiliser."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Sélection de la clé de chiffrement"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -189,7 +201,7 @@ msgstr ""
 "Veuillez resélectionner les clés qui doivent être utilisées pour ce "
 "destinataire."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -201,7 +213,7 @@ msgstr ""
 "\n"
 "Sélectionnez les clés à utiliser pour ce destinataire."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -239,8 +251,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"Les clés publiques du ou des utilisateurs suivants ne sont pas certifiées par "
-"une signature sûre\n"
+"Les clés publiques du ou des utilisateurs suivants ne sont pas certifiées "
+"par une signature sûre\n"
 "%1.\n"
 "Le message ne sera pas chiffré."
 
@@ -250,8 +262,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"Les clés publiques du ou des utilisateurs suivants ne sont pas certifiées par "
-"une signature sûre\n"
+"Les clés publiques du ou des utilisateurs suivants ne sont pas certifiées "
+"par une signature sûre\n"
 "%1.\n"
 "Ces personnes ne pourront pas lire le message."
 
@@ -261,11 +273,11 @@ msgstr "Mauvaise phrase de passe. Impossible de signer."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Signature impossible : veuillez vérifier votre identité PGP, la configuration "
-"de PGP et vos trousseaux de clés."
+"Signature impossible : veuillez vérifier votre identité PGP, la "
+"configuration de PGP et vos trousseaux de clés."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -307,8 +319,8 @@ msgstr "La phrase de passe saisie n'est pas valable."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "La ou les clés que vous voulez utiliser pour chiffrer le message ne sont pas "
 "sûres. Aucun chiffrage n'a été effectué."
@@ -362,7 +374,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "Problème lors de l'exécution de GnuPG."
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (fichier ~/.gnupg/pubring.gpg introuvable)"
 
@@ -378,14 +390,19 @@ msgstr ""
 "Veuillez saisir la phrase de passe OpenPGP pour\n"
 "« %1 » :"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Avertissement de PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Veuillez vérifier que le chiffrage fonctionne réellement avant de commencer à "
-"l'utiliser sérieusement. Gardez également en mémoire que le module PGP / GnuPG "
-"ne chiffre pas les pièces jointes."
+"Veuillez vérifier que le chiffrage fonctionne réellement avant de commencer "
+"à l'utiliser sérieusement. Gardez également en mémoire que le module PGP / "
+"GnuPG ne chiffre pas les pièces jointes."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -419,35 +436,37 @@ msgstr "PGP Version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Ne pas utiliser d'outil de chiffrage"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Con&server la phrase de passe en mémoire"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Lorsque cette option est activée, la phrase de passe de votre clé privée "
-"sera mémorisée par l'application jusqu'à la fermeture de celle-ci. Vous n'aurez "
-"donc à la saisir qu'une seule fois.</p> "
-"<p>Soyez conscient que ceci peut présenter des risques au niveau de la "
-"sécurité. Si vous partez de votre ordinateur, d'autres personnes pourront "
-"l'utiliser pour envoyer des messages signés et / ou lire vos messages cryptés. "
-"Si un vidage de la mémoire (core dump) se produit, le contenu de la mémoire "
-"vive sera enregistré sur le disque, et votre phrase de passe s'y trouvera.</p> "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt> <p>Lorsque cette option est activée, la phrase de passe de votre clé "
+"privée sera mémorisée par l'application jusqu'à la fermeture de celle-ci. "
+"Vous n'aurez donc à la saisir qu'une seule fois.</p> <p>Soyez conscient que "
+"ceci peut présenter des risques au niveau de la sécurité. Si vous partez de "
+"votre ordinateur, d'autres personnes pourront l'utiliser pour envoyer des "
+"messages signés et / ou lire vos messages cryptés. Si un vidage de la "
+"mémoire (core dump) se produit, le contenu de la mémoire vive sera "
+"enregistré sur le disque, et votre phrase de passe s'y trouvera.</p> "
 "<p>Notez que pour KMail, ce paramètre n'est pris en compte que si vous "
-"n'utilisez pas gpg-agent. Il est également ignoré si vous utiliser les modules "
-"de cryptographie.</p></qt>"
+"n'utilisez pas gpg-agent. Il est également ignoré si vous utiliser les "
+"modules de cryptographie.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -455,17 +474,15 @@ msgstr "Toujours chiffrer &vers soi-même"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Lorsque cette option est activée, le message / fichier n'est pas chiffré "
-"seulement avec la clé publique du destinataire, mais également avec votre clé. "
-"Ceci vous permettra de déchiffrer le message / fichier plus tard. Cela est "
-"généralement d'une bonne idée.</p></qt>"
+"<qt><p>Lorsque cette option est activée, le message / fichier n'est pas "
+"chiffré seulement avec la clé publique du destinataire, mais également avec "
+"votre clé. Ceci vous permettra de déchiffrer le message / fichier plus tard. "
+"Cela est généralement d'une bonne idée.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -473,17 +490,15 @@ msgstr "Afficher le te&xte signé / chiffré après l'édition"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Lorsque cette option est activée, le texte signé / chiffré sera affiché dans "
-"une fenêtre séparée, vous permettant de savoir à quoi il ressemblera avant de "
-"l'envoyer. C'est une bonne idée si vous voulez vérifier que votre système de "
-"chiffrage fonctionne.</p></qt>"
+"<qt><p>Lorsque cette option est activée, le texte signé / chiffré sera "
+"affiché dans une fenêtre séparée, vous permettant de savoir à quoi il "
+"ressemblera avant de l'envoyer. C'est une bonne idée si vous voulez vérifier "
+"que votre système de chiffrage fonctionne.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -491,18 +506,17 @@ msgstr "Toujours afficher les clés de chi&ffrement"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Si cette option est activée, l'application affichera toujours une liste de "
-"clés publiques dans laquelle vous pourrez choisir celle que vous voulez "
-"utiliser pour le chiffrage. Si elle est désactivée, l'application n'affichera "
-"la fenêtre que lorsqu'elle ne peut pas trouver la bonne clé, ou que plusieurs "
-"peuvent être utilisées. </p></qt>"
+"<qt><p>Si cette option est activée, l'application affichera toujours une "
+"liste de clés publiques dans laquelle vous pourrez choisir celle que vous "
+"voulez utiliser pour le chiffrage. Si elle est désactivée, l'application "
+"n'affichera la fenêtre que lorsqu'elle ne peut pas trouver la bonne clé, ou "
+"que plusieurs peuvent être utilisées. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -522,13 +536,11 @@ msgstr "Mémoriser ce choix"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Si vous sélectionnez cette boîte, votre choix sera stockée et ne vous sera "
-"pas redemandé.</p></qt>"
+"<qt><p>Si vous sélectionnez cette boîte, votre choix sera stockée et ne vous "
+"sera pas redemandé.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -627,6 +639,10 @@ msgstr "Sélection de la clé OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Veuillez sélectionner la clé OpenPGP à utiliser."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Changer..."
@@ -691,8 +707,8 @@ msgid ""
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
 msgstr ""
-"Sélectionnez les clés qui doivent être utilisées pour chiffrer le message vers "
-"vous-même."
+"Sélectionnez les clés qui doivent être utilisées pour chiffrer le message "
+"vers vous-même."
 
 #: kpgpui.cpp:1543
 #, c-format
@@ -702,7 +718,8 @@ msgid ""
 "Select the key(s) which should be used to encrypt the message for\n"
 "%1"
 msgstr ""
-"Sélectionnez les clés qui doivent être utilisées pour chiffrer le message vers\n"
+"Sélectionnez les clés qui doivent être utilisées pour chiffrer le message "
+"vers\n"
 "%1"
 
 #: kpgpui.cpp:1619
diff --git a/tde-i18n-fy/messages/tdepim/libkpgp.po b/tde-i18n-fy/messages/tdepim/libkpgp.po
index 24dc308d5cd..df212d1b961 100644
--- a/tde-i18n-fy/messages/tdepim/libkpgp.po
+++ b/tde-i18n-fy/messages/tdepim/libkpgp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-04-29 14:35+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Frysk <kde-i18n-fry@kde.org>\n"
@@ -18,6 +18,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -38,7 +50,7 @@ msgstr "Wachtwurd is te lang. Dizze moat bestean út minder as1024 tekens."
 msgid "Out of memory."
 msgstr "Net genôch ûnthâld."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -46,16 +58,16 @@ msgstr ""
 "Jo hawwe krekt in ferkeard wachtwurd opjûn.\n"
 "Wolle jo it nochris besykje of it berjocht net-ûntsifere werjaan litte?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP-warskôging"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Nochris"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -65,11 +77,11 @@ msgstr ""
 "Wolle jo it opnij besykje, trochgean en it berjocht sûnder ûndertekening "
 "ferstjoere, of it ferstjoeren fan it berjocht annulearje?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "&Net-ûndertekene ferstjoere"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -79,26 +91,26 @@ msgstr ""
 "Wolle ko it berjocht sûnder ûndertekening ferstjoere, of it ferstjoeren "
 "annulearje?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Wolle jo it berjocht dochs fersiferje, litte sa't it is of it ferstjoeren "
 "annulearje?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Fersifere fer&stjoere"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "&Net-fersifere ferstjoere"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -107,11 +119,11 @@ msgstr ""
 "%1\n"
 "Wolle jo it berjocht litte sa't it is, of it ferstjoeren annulearje?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Sa &ferstjoere"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -120,7 +132,7 @@ msgstr ""
 "De folgjende fout die him foar:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -128,32 +140,32 @@ msgstr ""
 "Dit is de foutmelding fan %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Jo hawwe gjin kaai foar de ûntfanger fan dit berjocht keazen. It berjocht sil "
-"dêrom net fersifere wurde."
+"Jo hawwe gjin kaai foar de ûntfanger fan dit berjocht keazen. It berjocht "
+"sil dêrom net fersifere wurde."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Jo hawwe gjin kaai foar ien fan de ûntfangers keazen. It berjocht sil dêrom net "
-"fersifere wurde."
+"Jo hawwe gjin kaai foar ien fan de ûntfangers keazen. It berjocht sil dêrom "
+"net fersifere wurde."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Jo hawwe gjin fersiferingskaai selektearre foar ien fan de adressearden. Dizze "
-"persoan sil net by steat wêze om it berjocht te ûntsiferjen as jo it "
+"Jo hawwe gjin fersiferingskaai selektearre foar ien fan de adressearden. "
+"Dizze persoan sil net by steat wêze om it berjocht te ûntsiferjen as jo it "
 "fersiferje."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -161,7 +173,7 @@ msgstr ""
 "Jo hawwe gjin fersiferingskaaien selektearre foar inkele adressearden. Dizze "
 "persoanen sille it berjocht net lêze kinne as jo it fersiferje."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -169,18 +181,18 @@ msgstr ""
 "Dizze funksje\n"
 "ûntbrekt foarearst"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
-"Jo hawwe óf gjin GnuPG/PGP ynstallearre óf derfoar keazen om gjin GnuPG/PGP te "
-"brûken."
+"Jo hawwe óf gjin GnuPG/PGP ynstallearre óf derfoar keazen om gjin GnuPG/PGP "
+"te brûken."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Kaaiseleksje foar fersifering"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -192,7 +204,7 @@ msgstr ""
 "\n"
 "Selektearje de kaai(en) dy't brûkt wurde moat(te) foar dizze ûntfanger."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -204,7 +216,7 @@ msgstr ""
 "\n"
 "Selektearje de kaai(en) dy't foar de ûntfanger brûkt wurde sille."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -233,8 +245,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"Der koenen gjin publike kaaien fûn wurden dy't oerienkomme mei de "
-"brûkers-id('s)\n"
+"Der koenen gjin publike kaaien fûn wurden dy't oerienkomme mei de brûkers-"
+"id('s)\n"
 "%1.\n"
 "Dizze minsken sille it berjocht net ûntsiferje kinne"
 
@@ -266,11 +278,11 @@ msgstr "Ferkeard wachtwurd (passphrase); it ûndertekenjen is mislearre."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"De ûndertekening is mislearre. Kontrolearje asjebleaft jo "
-"PGP-brûkersidentiteit, de PGP-ynstellingen en de kaairingen."
+"De ûndertekening is mislearre. Kontrolearje asjebleaft jo PGP-"
+"brûkersidentiteit, de PGP-ynstellingen en de kaairingen."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -313,11 +325,11 @@ msgstr "It wachtwurd (passphrase) dat jo ynfierden is ûnjildich."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"De kaai(en) dêr't jo it berjocht mei fersiferje wolle is (binne) net betroud. "
-"It fersiferjen is annulearre."
+"De kaai(en) dêr't jo it berjocht mei fersiferje wolle is (binne) net "
+"betroud. It fersiferjen is annulearre."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -366,7 +378,7 @@ msgstr "Undertekening mislearre trochdat jo geheime kaai ûnbrûkber is."
 msgid "Error running gpg"
 msgstr "Fout by útfieren fan GPG"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (triem ~/.gnupg/pubring.gpg is net fûn)"
 
@@ -382,14 +394,19 @@ msgstr ""
 "Fier jo OpenPGP-wachtwurd (passphrase) yn foar\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP-warskôging"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Graach kontrolearje oft de fersifering werklik wurket foardat jo it serieus "
-"begjinne te brûken. Tink der ek om dat de taheaksels net troch de "
-"PGP/GPG-module fersifere wurde."
+"begjinne te brûken. Tink der ek om dat de taheaksels net troch de PGP/GPG-"
+"module fersifere wurde."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -423,32 +440,33 @@ msgstr "PGP-ferzje 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Gjin fersiferingsark brûke"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Wachtwurd (passphrase) yn ûnthâld be&warje"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>As dizze opsje ynskeakele is, sil it wachtwurd fan jo private kaai ûnthâlden "
-"wurde wylst de tapassing iepene is. Jo hoege it wachtwurd dus mar ien kear yn "
-"te foljen.</p> "
-"<p>Betink dat dit in befeiligingsrisiko wêze kin. Als jo jo wurkplak ferlitte "
-"kinne oaren it wachtwurd brûke om ûndertekene berjochten te ferstjoeren en/of "
-"jo fersifere berjochten lêze. Als it programma fêstrint sil yn de oanmakke "
-"core-dump (de ynhâld fan jo ram-ûnthâld opslein yn in triem mei de namme "
-"\"Core\") jo wachtwurd stean.</p> "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>As dizze opsje ynskeakele is, sil it wachtwurd fan jo private kaai "
+"ûnthâlden wurde wylst de tapassing iepene is. Jo hoege it wachtwurd dus mar "
+"ien kear yn te foljen.</p> <p>Betink dat dit in befeiligingsrisiko wêze kin. "
+"Als jo jo wurkplak ferlitte kinne oaren it wachtwurd brûke om ûndertekene "
+"berjochten te ferstjoeren en/of jo fersifere berjochten lêze. Als it "
+"programma fêstrint sil yn de oanmakke core-dump (de ynhâld fan jo ram-"
+"ûnthâld opslein yn in triem mei de namme \"Core\") jo wachtwurd stean.</p> "
 "<p>Opmerking: as jo KMail brûke sil dizze ynstelling allinnich fan tapassing "
 "wêze as jo gpg-agent net brûke. Dizze ynstelling is ek net fan tapassing op "
 "fersifere plugins.</p></qt>"
@@ -459,17 +477,15 @@ msgstr "Altyd foar josels fersifer&je"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>As dizze opsje ynskeakele is sil it berjocht/de triem net allinnich "
-"fersifere wurde mei de publike kaai fan de ûntfanger, mar ek mei jo eigen kaai. "
-"Jo kinne dan op in letter momint it berjocht/de triem ûntsiferje. Dit is oer it "
-"generaal in goed idee.</p></qt>"
+"<qt><p>As dizze opsje ynskeakele is sil it berjocht/de triem net allinnich "
+"fersifere wurde mei de publike kaai fan de ûntfanger, mar ek mei jo eigen "
+"kaai. Jo kinne dan op in letter momint it berjocht/de triem ûntsiferje. Dit "
+"is oer it generaal in goed idee.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -477,16 +493,15 @@ msgstr "Fersifere/ûndertekene tekst toane nei it op&stellen"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>As dizze opsje ynskeakele is, dan sil de ûndertekene/fersifere tekst toand "
-"wurde yn in apart finster. Sa kinne jo it earst besjen foardat jo it "
-"ferstjoere. Sa kinne jo neigean oft it fersiferingssysteem goed wurket.</p></qt>"
+"<qt><p>As dizze opsje ynskeakele is, dan sil de ûndertekene/fersifere tekst "
+"toand wurde yn in apart finster. Sa kinne jo it earst besjen foardat jo it "
+"ferstjoere. Sa kinne jo neigean oft it fersiferingssysteem goed wurket.</p></"
+"qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -494,17 +509,16 @@ msgstr "Altyd de kaaien foar &goedkarring sjen litte"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>As dizze opsje ynskeakele is sil de tapassing altyd in list mei publike "
-"kaaien toane. Hjirút kinne jo de kaai kieze om mei te fersiferjen. As dizze "
-"opsje útskeakele is, sil de tapassing de list allinnich toane as de goede kaai "
-"net fûn is, of as der meardere kaaien brûkt wurde kinne. </p></qt>"
+"<qt><p>As dizze opsje ynskeakele is sil de tapassing altyd in list mei "
+"publike kaaien toane. Hjirút kinne jo de kaai kieze om mei te fersiferjen. "
+"As dizze opsje útskeakele is, sil de tapassing de list allinnich toane as de "
+"goede kaai net fûn is, of as der meardere kaaien brûkt wurde kinne. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -524,13 +538,11 @@ msgstr "Kar ûnthâlde"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>As jo dit karfakje selektearje, dan wurdt jo kar opslein en sille jo net "
-"mear frege wurde.</p></qt>"
+"<qt> <p>As jo dit karfakje selektearje, dan wurdt jo kar opslein en sille jo "
+"net mear frege wurde.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -629,6 +641,10 @@ msgstr "Seleksje fan OpenPGP-kaai"
 msgid "Please select an OpenPGP key to use."
 msgstr "Graach de te brûken OpenPGP-kaai selektearje"
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Oanpasse..."
diff --git a/tde-i18n-ga/messages/tdepim/libkpgp.po b/tde-i18n-ga/messages/tdepim/libkpgp.po
index 26e4f5b78ba..42984b775c4 100644
--- a/tde-i18n-ga/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ga/messages/tdepim/libkpgp.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/libkpgp.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -10,6 +10,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -28,67 +40,67 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Cuimhne ídithe."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Rabhadh PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "At&riail"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Seol &Gan Síniú"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "S&eol Criptithe"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Seol &Gan Criptiú"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Seol Mar Atá"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -97,7 +109,7 @@ msgstr ""
 "Tharla an earráid seo a leanas:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -105,31 +117,31 @@ msgstr ""
 "Is í seo an teachtaireacht earráide de %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -137,16 +149,16 @@ msgstr ""
 "Tá an ghné seo\n"
 "ar iarraidh fós"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Roghnú Eochrach Criptithe"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -155,7 +167,7 @@ msgid ""
 "Please re-select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -164,7 +176,7 @@ msgid ""
 "Select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -207,8 +219,8 @@ msgstr ""
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 
 #: kpgpbase2.cpp:213
@@ -247,8 +259,8 @@ msgstr ""
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 
 #: kpgpbase5.cpp:157
@@ -295,7 +307,7 @@ msgstr "Theip ar shíniú; níl d'eochair rúnda inúsáidte."
 msgid "Error running gpg"
 msgstr "Earráid agus gpg á rith"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (comhad ~/.gnupg/pubring.gpg gan aimsiú)"
 
@@ -309,6 +321,11 @@ msgid ""
 "\"%1\":"
 msgstr ""
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Rabhadh PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -347,22 +364,25 @@ msgstr "PGP Leagan 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Ná húsáid uirlis chriptithe ar bith"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Coinnigh an frása faire i gcuimhne"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:174
@@ -371,11 +391,10 @@ msgstr ""
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:188
@@ -384,11 +403,10 @@ msgstr ""
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:200
@@ -397,11 +415,11 @@ msgstr "Taispeáin na heochracha criptithe i gcónaí lena g&ceadú"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
 
 #: kpgpui.cpp:327
@@ -422,9 +440,8 @@ msgstr "Meabhraigh mo rogha"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:391
@@ -524,6 +541,10 @@ msgstr "Roghnú Eochrach OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Roghnaigh eochair OpenPGP le do thoil."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Athraigh..."
diff --git a/tde-i18n-gl/messages/tdepim/libkpgp.po b/tde-i18n-gl/messages/tdepim/libkpgp.po
index ff5fd2d3b48..48c512aa289 100644
--- a/tde-i18n-gl/messages/tdepim/libkpgp.po
+++ b/tde-i18n-gl/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2006-12-30 13:40+0100\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr "O contrasinal é moi longo, precisa ter menos de 1024 caracteres."
 msgid "Out of memory."
 msgstr "Fóra de memoria."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,16 +54,16 @@ msgstr ""
 "Acaba de inserir un contrasinal non válido.\n"
 "Quere tentalo de novo, ou cancelar e ver a mensaxe descifrada?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Advertencia PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Retentar"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,11 +73,11 @@ msgstr ""
 "Quere tentalo de novo, continuar e deixar a mensaxe sen asinar ou cancelar o "
 "envío da mensaxe?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Enviar Sen &Asinar"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -74,26 +86,26 @@ msgstr ""
 "%1\n"
 "Quere enviar a mensaxe sen asinar, ou cancelar o envío da mensaxe?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Quere aínda así cifrar, deixar a mensaxe como está ou cancelar o envío da "
 "mensaxe?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Enviar &Cifrado"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Enviar &Sen Cifrar"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -102,11 +114,11 @@ msgstr ""
 "%1\n"
 "Quere deixar a mensaxe como está, ou cancelar o envío da mensaxe?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Enviar Como Está"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -115,7 +127,7 @@ msgstr ""
 "Ocorreu o seguinte erro:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -123,23 +135,23 @@ msgstr ""
 "Éste é a mensaxe de erro de %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Non seleccionou unha chave de cifraxe para o destinatario desta mensaxe; polo "
-"tanto, a mensaxe non se cifrará."
+"Non seleccionou unha chave de cifraxe para o destinatario desta mensaxe; "
+"polo tanto, a mensaxe non se cifrará."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Non seleccionou unha chave de cifraxe para ningún dos destinatarios desta "
 "mensaxe; polo tanto, a mensaxe non se cifrará."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -147,7 +159,7 @@ msgstr ""
 "Non seleccionou unha chave de cifraxe para un dos destinatarios; esta persoa "
 "non será quen de descifrar a mensaxe se a cifra."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -155,7 +167,7 @@ msgstr ""
 "Non seleccionou chave de cifrado para algún dos destinatarios; estas persoas "
 "non serán quen de descifrar a mensaxe se vostede a cifra."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -163,16 +175,16 @@ msgstr ""
 "Esta característica\n"
 "está aínda non dispoñíbel"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "Ou non ten o GnuPG/PG instalado ou escolleu non empregar GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Selección de Chave de Cifraxe"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -185,7 +197,7 @@ msgstr ""
 "Por favor, reseleccione a(s) chave(s) que se deberían empregar para este "
 "destinatario."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -197,7 +209,7 @@ msgstr ""
 "\n"
 "Escolla a(s) chave(s) que se debería(n) empregar para este destinatario."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -235,8 +247,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"Chaves públicas non certificadas con sinatura autentificada para o(s) ID(s) de "
-"usuario\n"
+"Chaves públicas non certificadas con sinatura autentificada para o(s) ID(s) "
+"de usuario\n"
 "%1.\n"
 "A mensaxe non está cifrada."
 
@@ -257,8 +269,8 @@ msgstr "Mal contrasinal; non se puido asinar."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Fallou o asinamento: por favor comprobe a súa identidade de usuario PGP, a "
 "configuración de PGP e os aneis de chaves."
@@ -266,8 +278,8 @@ msgstr ""
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
 msgstr ""
-"Fallou a cifraxe: por favor, comprobe a súa configuración de PGP e os aneis de "
-"cifraxe."
+"Fallou a cifraxe: por favor, comprobe a súa configuración de PGP e os aneis "
+"de cifraxe."
 
 #: kpgpbase2.cpp:259 kpgpbase6.cpp:62 kpgpbase6.cpp:360
 msgid "error running PGP"
@@ -303,11 +315,11 @@ msgstr "O contrasinal que inseriu non é válido."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"A(s) chave(s) coa(s) que quere cifrar a súa mensaxe non está(n) autenticada(s). "
-"Non se fixo a cifraxe."
+"A(s) chave(s) coa(s) que quere cifrar a súa mensaxe non está(n) "
+"autenticada(s). Non se fixo a cifraxe."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -356,7 +368,7 @@ msgstr "Fallou o asinamento porque a súa chave segreda non é usábel."
 msgid "Error running gpg"
 msgstr "Erro ao executar gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (ficheiro ~/.gnupg/pubring.gpg non atopado)"
 
@@ -372,13 +384,19 @@ msgstr ""
 "Por favor, insira o contrasinal OpenPGP para\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Advertencia PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Por favor, comprobe que a cifraxe funciona antes de comezar a usala seriamente. "
-"Teña en conta tamén que os anexos non se cifran co módulo PGP/GPG."
+"Por favor, comprobe que a cifraxe funciona antes de comezar a usala "
+"seriamente. Teña en conta tamén que os anexos non se cifran co módulo PGP/"
+"GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -412,34 +430,35 @@ msgstr "PGP Versión 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Non empregar ningunha ferramenta de cifraxe"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Lembrar o contrasinal"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Cando se habilita esta opción, o contrasinal da súa chave privada lembrarase "
-"pola aplicación durante a execución da mesma. Así que só terá que inserir o "
-"contrasinal unha vez.</p>"
-"<p>Sexa consciente de que isto supón un risco en seguridade. Se deixa o seu "
-"ordenador outros poderán usalo para enviar mensaxes asinadas e/ou para ler as "
-"súas mensaxes cifradas. Se por algunha razón hai un volcado, os contidos da súa "
-"RAM gravaranse no dicos, incluindo o seu contrasinal.</p>"
-"<p>Note que cando se usa KMail esta opción só cobra senso se non se está a "
-"empregar o gpg-agent. Ignórase así mesmo se está a usar as extensións "
-"criptográficas.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Cando se habilita esta opción, o contrasinal da súa chave privada "
+"lembrarase pola aplicación durante a execución da mesma. Así que só terá que "
+"inserir o contrasinal unha vez.</p><p>Sexa consciente de que isto supón un "
+"risco en seguridade. Se deixa o seu ordenador outros poderán usalo para "
+"enviar mensaxes asinadas e/ou para ler as súas mensaxes cifradas. Se por "
+"algunha razón hai un volcado, os contidos da súa RAM gravaranse no dicos, "
+"incluindo o seu contrasinal.</p><p>Note que cando se usa KMail esta opción "
+"só cobra senso se non se está a empregar o gpg-agent. Ignórase así mesmo se "
+"está a usar as extensións criptográficas.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -447,16 +466,15 @@ msgstr "Cifrar&se sempre a un memsmo"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cando se habilita esta opción, o ficheiro ou mensaxe non será só cifrado coa "
-"chave pública do destinatario, senón tamén coa súa chave. Isto permitiralle "
-"descifrar a mensaxe ou ficheiro no futuro. É xeralmente unha boa idea.</p></qt>"
+"<qt><p>Cando se habilita esta opción, o ficheiro ou mensaxe non será só "
+"cifrado coa chave pública do destinatario, senón tamén coa súa chave. Isto "
+"permitiralle descifrar a mensaxe ou ficheiro no futuro. É xeralmente unha "
+"boa idea.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -464,17 +482,15 @@ msgstr "Amo&sar texto asinado/cifrado despois da edición"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Cando se habilita esta opción, o texto cifrado/asinado amosarase nunha "
-"fiestra separada, permitíndolle saber como se amosará despois de que se envíe. "
-"É unha boa idea cando se quere verificar que o seu sistema de cifraxe funciona "
-"ben.</p></qt>"
+"<qt><p>Cando se habilita esta opción, o texto cifrado/asinado amosarase "
+"nunha fiestra separada, permitíndolle saber como se amosará despois de que "
+"se envíe. É unha boa idea cando se quere verificar que o seu sistema de "
+"cifraxe funciona ben.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -482,17 +498,16 @@ msgstr "Amosar sempre as chaves de cifrado &para aprobala"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Cando se habilita esta opción, a aplicación amosará sempre unha lista das "
-"chaves públicas dende a que pode escoller unha a se empregar na cifraxe. Se non "
-"se activa, a aplicación só amosará o diálogo se non pode atopar a chave "
-"correcta ou se hai varias que se poden empregar. </p></qt>"
+"<qt><p>Cando se habilita esta opción, a aplicación amosará sempre unha lista "
+"das chaves públicas dende a que pode escoller unha a se empregar na cifraxe. "
+"Se non se activa, a aplicación só amosará o diálogo se non pode atopar a "
+"chave correcta ou se hai varias que se poden empregar. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -512,13 +527,11 @@ msgstr "Lembrar a escolla"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Se activa esta caixiña, a súa escolla almacenarase e non lle será preguntado "
-"isto de novo.</p></qt>"
+"<qt><p>Se activa esta caixiña, a súa escolla almacenarase e non lle será "
+"preguntado isto de novo.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -617,6 +630,10 @@ msgstr "Selección de Chave OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Por favor, seleccione unha chave OpenPGP a se empregar."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Mudar..."
diff --git a/tde-i18n-hu/messages/tdepim/libkpgp.po b/tde-i18n-hu/messages/tdepim/libkpgp.po
index 46d2b607290..13f33ec4cf8 100644
--- a/tde-i18n-hu/messages/tdepim/libkpgp.po
+++ b/tde-i18n-hu/messages/tdepim/libkpgp.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-04-01 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -12,6 +12,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -32,7 +44,7 @@ msgstr "A jelszó túl hosszú, max. 1023 karaktert tartalmazhat."
 msgid "Out of memory."
 msgstr "Nincs elég memória."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -41,16 +53,16 @@ msgstr ""
 "Megpróbálja még egyszer megadni, vagy inkább dekódolás nélkül nézi meg az "
 "üzenetet?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP figyelmeztetés"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Újra"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -60,11 +72,11 @@ msgstr ""
 "Megpróbálja még egyszer megadni, továbblép és aláírás nélkül küldi el az "
 "üzenetet, vagy inkább nem küldi el az üzenetet?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Elkül&dés aláírás nélkül"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -73,26 +85,26 @@ msgstr ""
 "%1\n"
 "Aláírás nélkül elküldi az üzenetet, vagy inkább nem küldi el az üzenetet?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Titkosítani szeretné az üzenetet, így hagyja az üzenetet, vagy inkább nem küldi "
-"el az üzenetet?"
+"Titkosítani szeretné az üzenetet, így hagyja az üzenetet, vagy inkább nem "
+"küldi el az üzenetet?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Küldés &titkosítva"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Küldés titkosítás nél&kül"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -101,11 +113,11 @@ msgstr ""
 "%1\n"
 "Így hagyja az üzenetet, vagy inkább nem küldi el az üzenetet?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Elküldés í&gy"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -114,7 +126,7 @@ msgstr ""
 "Az alábbi hiba történt:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -122,7 +134,7 @@ msgstr ""
 "%1 hibaüzenete:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -130,31 +142,31 @@ msgstr ""
 "Nem választott ki titkosítási kulcsot a címzetthez, ezért az üzenet nem lesz "
 "titkosítva."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Nem választott ki titkosítási kulcsot egyik címzetthez sem, ezért az üzenet nem "
-"lesz titkosítva."
+"Nem választott ki titkosítási kulcsot egyik címzetthez sem, ezért az üzenet "
+"nem lesz titkosítva."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nem választott ki titkosítási kulcsot az egyik címzetthez. Az illető nem fogja "
-"tudni dekódolni az üzenetet, ha azt titkosítja."
+"Nem választott ki titkosítási kulcsot az egyik címzetthez. Az illető nem "
+"fogja tudni dekódolni az üzenetet, ha azt titkosítja."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nem választott ki titkosítási kulcsot néhány címzetthez. Ezek a személyek nem "
-"fogják tudni dekódolni az üzenetet, ha azt titkosítja."
+"Nem választott ki titkosítási kulcsot néhány címzetthez. Ezek a személyek "
+"nem fogják tudni dekódolni az üzenetet, ha azt titkosítja."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -162,16 +174,16 @@ msgstr ""
 "Ez a funkció\n"
 "még nem használható"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "Nincs telepítve a GnuPG/PGP vagy nem kérte a használatát."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Titkosítási kulcs kiválasztása"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -183,7 +195,7 @@ msgstr ""
 "\n"
 "Válassza ki újból, melyik kulcsokat szeretné használni."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -195,7 +207,7 @@ msgstr ""
 "\n"
 "Válassza ki, melyik kulcsokat szeretné használni."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -253,8 +265,8 @@ msgstr "A jelszó hibás, az aláírás ezért nem sikerült."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Az aláírás nem sikerült: ellenőrizze a PGP-s azonosítóját, a PGP-s "
 "beállításokat és a kulcsokat."
@@ -298,11 +310,11 @@ msgstr "A megadott jelszó hibás."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Az üzenet titkosításához használni kívánt kulcs(ok) nem megbízhatók, ezért nem "
-"történik titkosítás."
+"Az üzenet titkosításához használni kívánt kulcs(ok) nem megbízhatók, ezért "
+"nem történik titkosítás."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -351,7 +363,7 @@ msgstr "Az aláírás nem sikerült, mert a saját privát kulcs nem használhat
 msgid "Error running gpg"
 msgstr "A gpg futtatása nem sikerült"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (nem található a ~/.gnupg/pubring.gpg fájl)"
 
@@ -367,6 +379,11 @@ msgstr ""
 "Kérem adja meg az alábbihoz tartozó OpenPGP-s jelszavát\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP figyelmeztetés"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -407,34 +424,35 @@ msgstr "PGP 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Nem kell titkosító eszköz"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "A jelszó megőrzése a memór&iában"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ha ez az opció be van jelölve, a privát kulcshoz tartozó jelszó el lesz "
-"tárolva a memóriában, amíg az alkalmazás fut. Ezért ilyenkor elég a jelszót "
-"egyszer bekapcsolni.</p>"
-"<p>Az opció használata azonban potenciálisan veszélyes lehet. Ha magára hagyja "
-"a számítógépét, és mások hozzáférhetnek a géphez, akkor aláírt/titkosított "
-"üzenetet küldhetnek az Ön nevében. Ha az operációs rendszerben memóriadump "
-"készül, akkor a jelszó is lementődik a merevlemezre.</p>"
-"<p>Ha a KMailt használja, akkor ennek az opciónak csak akkor van hatása, ha nem "
-"a gpg-agent programot használja. Továbbá titkosítási modulok használata esetén "
-"sincs kihatása.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Ha ez az opció be van jelölve, a privát kulcshoz tartozó jelszó el "
+"lesz tárolva a memóriában, amíg az alkalmazás fut. Ezért ilyenkor elég a "
+"jelszót egyszer bekapcsolni.</p><p>Az opció használata azonban potenciálisan "
+"veszélyes lehet. Ha magára hagyja a számítógépét, és mások hozzáférhetnek a "
+"géphez, akkor aláírt/titkosított üzenetet küldhetnek az Ön nevében. Ha az "
+"operációs rendszerben memóriadump készül, akkor a jelszó is lementődik a "
+"merevlemezre.</p><p>Ha a KMailt használja, akkor ennek az opciónak csak "
+"akkor van hatása, ha nem a gpg-agent programot használja. Továbbá "
+"titkosítási modulok használata esetén sincs kihatása.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -442,17 +460,15 @@ msgstr "Mindig titkosítás saját &célra"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ha ez az opció be van jelölve, az üzenet/fájl nemcsak a címzett publikus "
-"kulcsával lesz titkosítva, hanem a saját publikus kulccsal is. Így az "
-"üzenetet/fájlt később is bármikor dekódolhatja. Érdemes bekapcsolva hagyni.</p>"
-"</qt>"
+"<qt><p>Ha ez az opció be van jelölve, az üzenet/fájl nemcsak a címzett "
+"publikus kulcsával lesz titkosítva, hanem a saját publikus kulccsal is. Így "
+"az üzenetet/fájlt később is bármikor dekódolhatja. Érdemes bekapcsolva "
+"hagyni.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -460,17 +476,15 @@ msgstr "Az aláírt/titkosított szöveg me&gjelenítése a szerkesztés végén
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ha ez az opció be van jelölve, az aláírt/titkosított szöveg külön ablakban "
-"fog mindig megjelenni, hogy elküldés előtt megtekinthető legyen. Erre általában "
-"akkor van szükség, ha ellenőrizni kell a titkosítási funkciók működését.</p>"
-"</qt>"
+"<qt><p>Ha ez az opció be van jelölve, az aláírt/titkosított szöveg külön "
+"ablakban fog mindig megjelenni, hogy elküldés előtt megtekinthető legyen. "
+"Erre általában akkor van szükség, ha ellenőrizni kell a titkosítási funkciók "
+"működését.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -478,18 +492,17 @@ msgstr "Mindig j&elenjen meg a titkosítási kulcs választóablaka"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Ha ez az opció be van jelölve, akkor a program megjeleníti a rendelkezésre "
-"álló publikus kulcsok listáját, melyből ki kell választani azt, amelyet a "
-"titkosításhoz használni szeretne. Ha nincs bejelölve, akkor a program csak "
-"akkor jeleníti meg ezt az ablakot, ha nem találja a megfelelő kulcsot vagy több "
-"kulcs is megfelelő lehet. </p></qt>"
+"<qt><p>Ha ez az opció be van jelölve, akkor a program megjeleníti a "
+"rendelkezésre álló publikus kulcsok listáját, melyből ki kell választani "
+"azt, amelyet a titkosításhoz használni szeretne. Ha nincs bejelölve, akkor a "
+"program csak akkor jeleníti meg ezt az ablakot, ha nem találja a megfelelő "
+"kulcsot vagy több kulcs is megfelelő lehet. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -509,13 +522,11 @@ msgstr "A választás megjegyzése"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ha bejelöli ezt az opciót, a választás el lesz mentve, és a program nem "
-"fogja többé megkérdezni.</p></qt>"
+"<qt><p>Ha bejelöli ezt az opciót, a választás el lesz mentve, és a program "
+"nem fogja többé megkérdezni.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -614,6 +625,10 @@ msgstr "OpenPGP-kulcs kiválasztása"
 msgid "Please select an OpenPGP key to use."
 msgstr "Válassza ki a használni kívánt OpenPGP-kulcsot."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Módosítás..."
@@ -678,7 +693,8 @@ msgid ""
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
 msgstr ""
-"Válassza ki az üzenet saját célra való titkosításához használandó kulcso(ka)t."
+"Válassza ki az üzenet saját célra való titkosításához használandó "
+"kulcso(ka)t."
 
 #: kpgpui.cpp:1543
 #, c-format
diff --git a/tde-i18n-is/messages/tdepim/libkpgp.po b/tde-i18n-is/messages/tdepim/libkpgp.po
index f6768fdfa67..47f42fb914c 100644
--- a/tde-i18n-is/messages/tdepim/libkpgp.po
+++ b/tde-i18n-is/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -32,119 +44,119 @@ msgstr ""
 msgid "Out of memory."
 msgstr ""
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr ""
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr ""
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr ""
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr ""
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr ""
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
 "%1"
 msgstr ""
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
 msgstr ""
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr ""
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr ""
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -153,7 +165,7 @@ msgid ""
 "Please re-select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -162,7 +174,7 @@ msgid ""
 "Select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -205,8 +217,8 @@ msgstr ""
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 
 #: kpgpbase2.cpp:213
@@ -245,8 +257,8 @@ msgstr ""
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 
 #: kpgpbase5.cpp:157
@@ -291,7 +303,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr ""
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr ""
 
@@ -305,6 +317,10 @@ msgid ""
 "\"%1\":"
 msgstr ""
 
+#: kpgpui.cpp:117
+msgid "Warning"
+msgstr ""
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -343,22 +359,25 @@ msgstr ""
 msgid "Do not use any encryption tool"
 msgstr ""
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr ""
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:174
@@ -367,11 +386,10 @@ msgstr ""
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:188
@@ -380,11 +398,10 @@ msgstr ""
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:200
@@ -393,11 +410,11 @@ msgstr ""
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
 
 #: kpgpui.cpp:327
@@ -418,9 +435,8 @@ msgstr ""
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:391
@@ -520,6 +536,10 @@ msgstr ""
 msgid "Please select an OpenPGP key to use."
 msgstr ""
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr ""
diff --git a/tde-i18n-it/messages/tdepim/libkpgp.po b/tde-i18n-it/messages/tdepim/libkpgp.po
index 4bea917887b..1784b60210d 100644
--- a/tde-i18n-it/messages/tdepim/libkpgp.po
+++ b/tde-i18n-it/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-04-28 16:17+0200\n"
 "Last-Translator: alessandro pasotti <ale.pas@tiscalinet.it>\n"
 "Language-Team: italian <kde-i18n-it-admin@master.kde.org>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -36,7 +48,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Memoria esaurita."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -44,30 +56,30 @@ msgstr ""
 "Hai appena inserito una frase segreta non valida.\n"
 "Vuoi riprovare, o annullare e vedere il messaggio non decifrato?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Avvertimento di PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Riprova"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Hai inserito una frase segreta non valida.\n"
-"Vuoi riprovare, continuare e lasciare il messaggio senza firma, o annullare la "
-"spedizione del messaggio?"
+"Vuoi riprovare, continuare e lasciare il messaggio senza firma, o annullare "
+"la spedizione del messaggio?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Spedisci &senza firma"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -76,26 +88,26 @@ msgstr ""
 "%1\n"
 "Vuoi spedire il messaggio senza firma, o annullare la spedizione?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Vuoi cifrarlo lo stesso, lasciarlo invariato o annullare la spedizione del "
 "messaggio?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Spedisci con &cifratura"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Spedisci &senza cifratura"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -104,11 +116,11 @@ msgstr ""
 "%1\n"
 "Vuoi lasciarlo invariato, o cancellare la spedizione del messaggio?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Spedisci così com'è"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +129,7 @@ msgstr ""
 "Si è verificato il seguente errore:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,7 +137,7 @@ msgstr ""
 "Questo è il messaggio di errore di %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -133,33 +145,33 @@ msgstr ""
 "Non hai selezionato alcuna chiave di cifratura per il destinatario di questo "
 "messaggio; il messaggio non sarà quindi cifrato."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Non hai selezionato alcuna chiave di cifratura per i destinatari di questo "
 "messaggio; il messaggio non sarà quindi cifrato."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "Non hai selezionato alcuna chiave di cifratura per uno dei destinatari di "
-"questo messaggio; questa persona non sarà quindi in grado di decifrarlo se lo "
-"invii cifrato."
+"questo messaggio; questa persona non sarà quindi in grado di decifrarlo se "
+"lo invii cifrato."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "Non hai selezionato alcuna chiave di cifratura per alcuni dei destinatari di "
-"questo messaggio; queste persone non saranno quindi in grado di decifrarlo se "
-"lo invii cifrato."
+"questo messaggio; queste persone non saranno quindi in grado di decifrarlo "
+"se lo invii cifrato."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -167,18 +179,18 @@ msgstr ""
 "Questa funzionalità\n"
 "è ancora assente"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
-"Non hai una chiave GnuPG/PGP installata oppure hai scelto di non usare "
-"GnuPG/PGP."
+"Non hai una chiave GnuPG/PGP installata oppure hai scelto di non usare GnuPG/"
+"PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Scelta chiave di cifratura"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,9 +200,10 @@ msgid ""
 msgstr ""
 "C'è un problema con la cifratura delle chiavi \"%1\".\n"
 "\n"
-"Riseleziona le chiavi che dovrebbero essere utilizzate per questo destinatario."
+"Riseleziona le chiavi che dovrebbero essere utilizzate per questo "
+"destinatario."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -202,7 +215,7 @@ msgstr ""
 "\n"
 "Seleziona le chiavi che dovrebbero essere usate per questo destinatario."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -258,8 +271,8 @@ msgstr "Frase segreta errata; impossibile firmare."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Firma fallita: controlla la tua identità PGP, le impostazioni PGP e il "
 "portachiavi."
@@ -302,8 +315,8 @@ msgstr "La frase segreta inserita non è valida."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Le chiavi con cui vuoi cifrare il messaggio non sono affidabili. Nessuna "
 "cifratura eseguita."
@@ -356,7 +369,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "Errore durante l'esecuzione di GPG"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (file ~/.gnupg/pubring.gpg non trovato)"
 
@@ -372,14 +385,19 @@ msgstr ""
 "Inserisci la tua frase segreta OpenPGP per\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Avvertimento di PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Controlla se la cifratura funziona effettivamente prima di utilizzarla "
-"seriamente. Nota inoltre che gli allegati non vengono cifrati dal modulo "
-"PGP/GPG."
+"seriamente. Nota inoltre che gli allegati non vengono cifrati dal modulo PGP/"
+"GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -413,35 +431,36 @@ msgstr "PGP versione 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Non usare alcuno strumento di cifratura"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Tieni in memoria la frase segreta"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Quando questa opzione è abilitata, la frase segreta della tua chiave privata "
-"verrà memorizzata dall'applicazione fino a che rimarrà in esecuzione. In questo "
-"modo la password può essere inserita solo una volta.</p> "
-"<p>Fai attenzione, però, perché ciò potrebbe essere un rischio per la "
-"sicurezza. Se ti allontani dal tuo computer, altre persone potrebbero inviare "
-"messaggi firmati a tuo nome o leggere la tua posta cifrata. Se effettui un core "
-"dump, il contenuto della tua RAM sarà salvato sul disco, inclusa la tua frase "
-"segreta.</p> "
-"<p>Nota che utilizzando KMail, questa opzione è applicabile solo se non stai "
-"usando gpg-agent. Allo stesso modo, verrà ignorata se stai usando i plugin "
-"crittografici.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Quando questa opzione è abilitata, la frase segreta della tua chiave "
+"privata verrà memorizzata dall'applicazione fino a che rimarrà in "
+"esecuzione. In questo modo la password può essere inserita solo una volta.</"
+"p> <p>Fai attenzione, però, perché ciò potrebbe essere un rischio per la "
+"sicurezza. Se ti allontani dal tuo computer, altre persone potrebbero "
+"inviare messaggi firmati a tuo nome o leggere la tua posta cifrata. Se "
+"effettui un core dump, il contenuto della tua RAM sarà salvato sul disco, "
+"inclusa la tua frase segreta.</p> <p>Nota che utilizzando KMail, questa "
+"opzione è applicabile solo se non stai usando gpg-agent. Allo stesso modo, "
+"verrà ignorata se stai usando i plugin crittografici.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -449,17 +468,15 @@ msgstr "C&ifra sempre i messaggi per te stesso"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quando questa opzione è abilitata, il messaggio o il file non sarà cifrato "
-"solo con la chiave pubblica del destinatario, ma anche con la tua. Questo ti "
-"permetterà di decifrare il messaggio o il file in un secondo tempo. Ciò, è "
-"generalmente una buona idea.</p></qt>"
+"<qt><p>Quando questa opzione è abilitata, il messaggio o il file non sarà "
+"cifrato solo con la chiave pubblica del destinatario, ma anche con la tua. "
+"Questo ti permetterà di decifrare il messaggio o il file in un secondo "
+"tempo. Ciò, è generalmente una buona idea.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -467,17 +484,15 @@ msgstr "&Mostra il testo cifrato/firmato dopo la composizione"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quando questa opzione è abilitata, il testo firmato o cifrato sarà "
-"visualizzato in una finestra separata, dandoti la possibilità di controllarlo "
-"prima dell'invio. Può essere utile per verificare che il tuo sistema di "
-"cifratura funzioni correttamente.</p></qt>"
+"<qt><p>Quando questa opzione è abilitata, il testo firmato o cifrato sarà "
+"visualizzato in una finestra separata, dandoti la possibilità di "
+"controllarlo prima dell'invio. Può essere utile per verificare che il tuo "
+"sistema di cifratura funzioni correttamente.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -485,18 +500,17 @@ msgstr "Mostra sempre le chiavi di cifratura &per l'approvazione"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Quando questa opzione è abilitata, l'applicazione visualizzerà sempre la "
-"lista delle chiavi pubbliche dalla quale potrai scegliere quella da usare per "
-"cifratura. Se questa opzione è disabilitata, l'applicazione mostrerà solo la "
-"finestra di dialogo nel caso non sia possibile trovare la chiave giusta oppure "
-"se ce ne sia più di una da utilizzare. </p></qt>"
+"<qt><p>Quando questa opzione è abilitata, l'applicazione visualizzerà sempre "
+"la lista delle chiavi pubbliche dalla quale potrai scegliere quella da usare "
+"per cifratura. Se questa opzione è disabilitata, l'applicazione mostrerà "
+"solo la finestra di dialogo nel caso non sia possibile trovare la chiave "
+"giusta oppure se ce ne sia più di una da utilizzare. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -516,13 +530,11 @@ msgstr "Ricorda la scelta"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Se selezioni questa casella la tua scelta verrà memorizzata e non ti sarà "
-"più richiesto di scegliere.</p></qt>"
+"<qt><p>Se selezioni questa casella la tua scelta verrà memorizzata e non ti "
+"sarà più richiesto di scegliere.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -621,6 +633,10 @@ msgstr "Selezione chiave OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Seleziona una chiave OpenPGP da usare."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Cambia..."
@@ -685,8 +701,8 @@ msgid ""
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
 msgstr ""
-"Seleziona le chiavi che dovrebbero essere utilizzate per cifrare il messaggio "
-"per te stesso."
+"Seleziona le chiavi che dovrebbero essere utilizzate per cifrare il "
+"messaggio per te stesso."
 
 #: kpgpui.cpp:1543
 #, c-format
diff --git a/tde-i18n-ja/messages/tdepim/libkpgp.po b/tde-i18n-ja/messages/tdepim/libkpgp.po
index b0b53160c87..444ca07416c 100644
--- a/tde-i18n-ja/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ja/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-01-06 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,77 +47,82 @@ msgstr "パスフレーズが長すぎます。1023 文字以下にしてくだ�
 msgid "Out of memory."
 msgstr "メモリ不足です。"
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 "入力されたパスフレーズは間違っています。\n"
-"もう一度入力しますか？それともキャンセルしてメッセージを復号せずに表示しますか？"
+"もう一度入力しますか？それともキャンセルしてメッセージを復号せずに表示します"
+"か？"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP 警告"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "再試行(&R)"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "入力されたパスフレーズは間違っています。\n"
-"もう一度入力しますか？メッセージを未署名のままにしておきますか？それともメッセージの送信をキャンセルしますか？"
+"もう一度入力しますか？メッセージを未署名のままにしておきますか？それともメッ"
+"セージの送信をキャンセルしますか？"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "未署名のまま送信(&U)"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"メッセージを未署名のまま送信しますか？それともメッセージの送信をキャンセルしますか？"
+"メッセージを未署名のまま送信しますか？それともメッセージの送信をキャンセルし"
+"ますか？"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"このまま暗号化しますか？メッセージをこのままにしておきますか？それともメッセージの送信をキャンセルしますか？"
+"このまま暗号化しますか？メッセージをこのままにしておきますか？それともメッ"
+"セージの送信をキャンセルしますか？"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "暗号化して送信(&E)"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "暗号化せずに送信(&U)"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"メッセージをこのままにしておきますか？それともメッセージの送信をキャンセルしますか？"
+"メッセージをこのままにしておきますか？それともメッセージの送信をキャンセルし"
+"ますか？"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "このまま送信(&S)"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -114,7 +131,7 @@ msgstr ""
 "以下のエラーが発生しました:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -122,31 +139,39 @@ msgstr ""
 "%1 のエラーメッセージです:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
-msgstr "このメッセージの受信者に暗号化鍵が選択されていないため、メッセージを暗号化しません。"
+msgstr ""
+"このメッセージの受信者に暗号化鍵が選択されていないため、メッセージを暗号化し"
+"ません。"
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
-msgstr "このメッセージのいずれの受信者にも暗号化鍵が選択されていないため、メッセージを暗号化しません。"
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
+msgstr ""
+"このメッセージのいずれの受信者にも暗号化鍵が選択されていないため、メッセージ"
+"を暗号化しません。"
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "受信者の一人に暗号化鍵が選択されていません。暗号化すると、その人はメッセージを復号できなくなります。"
+msgstr ""
+"受信者の一人に暗号化鍵が選択されていません。暗号化すると、その人はメッセージ"
+"を復号できなくなります。"
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "受信者のうちの数人に暗号化鍵が選択されていません。暗号化すると、それらの人はメッセージを復号できなくなります。"
+msgstr ""
+"受信者のうちの数人に暗号化鍵が選択されていません。暗号化すると、それらの人は"
+"メッセージを復号できなくなります。"
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -154,16 +179,18 @@ msgstr ""
 "この機能は\n"
 "まだありません。"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
-msgstr "GnuPG/PGP がインストールされていないか、GnuPG/PGP を使用しないよう選択されています。"
+msgstr ""
+"GnuPG/PGP がインストールされていないか、GnuPG/PGP を使用しないよう選択されて"
+"います。"
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "暗号化鍵の選択"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -175,7 +202,7 @@ msgstr ""
 "\n"
 "この受信者に使用する鍵を選択し直してください。"
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -187,7 +214,7 @@ msgstr ""
 "\n"
 "この受信者に使用する鍵を選択してください。"
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -243,9 +270,11 @@ msgstr "パスフレーズが不正です。署名できませんでした。"
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
-msgstr "署名に失敗しました: あなたの PGP ユーザ情報、PGP の設定、およびキーリングを確認してください。"
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
+msgstr ""
+"署名に失敗しました: あなたの PGP ユーザ情報、PGP の設定、およびキーリングを確"
+"認してください。"
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -285,9 +314,11 @@ msgstr "入力されたパスフレーズは不正です。"
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
-msgstr "あなたがメッセージの暗号化に使用しようとした鍵は信頼されていません。暗号化していません。"
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
+msgstr ""
+"あなたがメッセージの暗号化に使用しようとした鍵は信頼されていません。暗号化し"
+"ていません。"
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -334,7 +365,7 @@ msgstr "秘密鍵が使えないので、署名できませんでした。"
 msgid "Error running gpg"
 msgstr "gpg 実行エラー"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (ファイル ~/.gnupg/pubring.gpg が見つかりません)"
 
@@ -348,13 +379,18 @@ msgid ""
 "\"%1\":"
 msgstr "\"%1\" 用の OpenPGP パスフレーズを入力してください:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP 警告"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"実際に使い始める前に、暗号化が正しく機能することを確認してください。また、添付ファイルは PGP/GPG "
-"モジュールでは暗号化されないことにも注意してください。"
+"実際に使い始める前に、暗号化が正しく機能することを確認してください。また、添"
+"付ファイルは PGP/GPG モジュールでは暗号化されないことにも注意してください。"
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -388,30 +424,35 @@ msgstr "PGP Version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "どの暗号化ツールも使わない"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "パスフレーズをメモリに記憶する(&K)"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>このオプションを有効にすると、アプリケーションの起動中は秘密鍵のパスフレーズがメモリに記憶されます。これによって、パスフレーズを何度も入力する必要がなくな"
-"ります。</p>"
-"<p>しかし、この機能はセキュリティを危うくする可能性があることに注意してください。コンピュータから離れると、他の人がそのパスフレーズを用いて署名したメッセージ"
-"を送信したり、暗号化されたメッセージを読んだりできます。また、コアダンプが発生した場合、パスフレーズを含む RAM の内容がディスクに保存されます。</p>"
-"<p>KMail を使用する場合、この設定は gpg-agent "
-"を使用していない場合にのみ適用されます。また暗号化プラグインを使用している場合も無視されます。</p></qt> "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>このオプションを有効にすると、アプリケーションの起動中は秘密鍵のパスフ"
+"レーズがメモリに記憶されます。これによって、パスフレーズを何度も入力する必要"
+"がなくなります。</p><p>しかし、この機能はセキュリティを危うくする可能性がある"
+"ことに注意してください。コンピュータから離れると、他の人がそのパスフレーズを"
+"用いて署名したメッセージを送信したり、暗号化されたメッセージを読んだりできま"
+"す。また、コアダンプが発生した場合、パスフレーズを含む RAM の内容がディスクに"
+"保存されます。</p><p>KMail を使用する場合、この設定は gpg-agent を使用してい"
+"ない場合にのみ適用されます。また暗号化プラグインを使用している場合も無視され"
+"ます。</p></qt> "
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -419,15 +460,15 @@ msgstr "常に自分自身にも暗号化する(&Y)"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>このオプションを有効にすると、メッセージ/ファイルを受信者の公開鍵で暗号化するだけでなく、あなたの鍵でも暗号化します。これによって、後でメッセージ/ファイ"
-"ルを復号できるようになります。これは一般的にお勧めできるオプションです。</p></qt>"
+"<qt><p>このオプションを有効にすると、メッセージ/ファイルを受信者の公開鍵で暗"
+"号化するだけでなく、あなたの鍵でも暗号化します。これによって、後でメッセージ/"
+"ファイルを復号できるようになります。これは一般的にお勧めできるオプションで"
+"す。</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -435,15 +476,14 @@ msgstr "メッセージ作成後に署名/暗号化されたテキストを表�
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>このオプションを有効にすると、署名/暗号化されたテキストが別のウィンドウに表示され、それがどのように見えるかを送信前に確認できます。これは暗号化システムが"
-"正常に機能するかどうかを検証する場合に役立ちます。</p></qt>"
+"<qt><p>このオプションを有効にすると、署名/暗号化されたテキストが別のウィンド"
+"ウに表示され、それがどのように見えるかを送信前に確認できます。これは暗号化シ"
+"ステムが正常に機能するかどうかを検証する場合に役立ちます。</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -451,15 +491,15 @@ msgstr "常に暗号化鍵を表示して確認を求める(&F)"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>このオプションを有効にすると、暗号化に使う鍵を選択するための公開鍵のリストが常に表示されます。無効にすると、正しい鍵が見つからない、または使用可能な鍵が複"
-"数ある場合にのみダイアログが表示されます。</p></qt>"
+"<qt><p>このオプションを有効にすると、暗号化に使う鍵を選択するための公開鍵のリ"
+"ストが常に表示されます。無効にすると、正しい鍵が見つからない、または使用可能"
+"な鍵が複数ある場合にのみダイアログが表示されます。</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -479,10 +519,11 @@ msgstr "選択を記憶する"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
-msgstr "<qt><p>このボックスをチェックすると、あなたの選択が記憶され、次回からは質問されなくなります。</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
+msgstr ""
+"<qt><p>このボックスをチェックすると、あなたの選択が記憶され、次回からは質問さ"
+"れなくなります。</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -581,6 +622,10 @@ msgstr "OpenPGP 鍵の選択"
 msgid "Please select an OpenPGP key to use."
 msgstr "使用する OpenPGP 鍵を選択してください。"
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "変更..."
@@ -644,7 +689,8 @@ msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
-msgstr "メッセージを自分自身に対して暗号化するために使用する鍵を選択してください。"
+msgstr ""
+"メッセージを自分自身に対して暗号化するために使用する鍵を選択してください。"
 
 #: kpgpui.cpp:1543
 #, c-format
diff --git a/tde-i18n-kk/messages/tdepim/libkpgp.po b/tde-i18n-kk/messages/tdepim/libkpgp.po
index be5144cc98a..ddfb33f4f9b 100644
--- a/tde-i18n-kk/messages/tdepim/libkpgp.po
+++ b/tde-i18n-kk/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-04-15 17:17+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh\n"
@@ -15,6 +15,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,7 +47,7 @@ msgstr "Пароль тым ұзын, ол 1024 таңбадан аспау ке
 msgid "Out of memory."
 msgstr "Жад тапшылығы."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -43,16 +55,16 @@ msgstr ""
 "Келтірген пароліңіз дұрыс емес.\n"
 "Қайталап көресіз бе, әлде қайтып хатты шифрланған түрде көресіз бе?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP ескертуі"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "Қ&айталау"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -62,11 +74,11 @@ msgstr ""
 "Қайталап көресіз бе, әлде хатты қолтаңбаламай жалғастырасыз бе, немесе хатты "
 "жіберуден қайтып айнисіз бе?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Қ&олтаңбалаусыз жіберу"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -75,26 +87,26 @@ msgstr ""
 "%1\n"
 "Хатты қолтаңбаламай жібересіз бе, немесе хатты жіберуден қайтып айнисіз бе?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Сонда да шифрлайсыз ба, әлде хатты бар түрде қалдырасыз ба, немесе хатты "
 "жіберуден қайтып айнисіз бе?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Ш&ифрлап жіберу"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Шифрла&май жіберу"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -103,11 +115,11 @@ msgstr ""
 "%1\n"
 "Хатты бар түрде қалдырасыз ба, немесе хатты жіберуден қайтып айнисіз бе?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Бар түрде &жіберу"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -116,7 +128,7 @@ msgstr ""
 "Келесі қате пайда болды:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -124,37 +136,38 @@ msgstr ""
 "Бұл %1 дегеннен қате хабарламасы:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 "Сіз осы хатты алу үшін шифрлау кілтін таңдап алмадыңыз, хат шифрланбайды."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Сіз осы хатты алушылар үшін шифрлау кілтін таңдап алмадыңыз, хат шифрланбайды."
+"Сіз осы хатты алушылар үшін шифрлау кілтін таңдап алмадыңыз, хат "
+"шифрланбайды."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Сіз осы хатты алушылардың біреуі үшін шифрлау кілтін таңдап алмадыңыз, ол хат "
-"шифрланса оның шифрын шеше алмайды."
+"Сіз осы хатты алушылардың біреуі үшін шифрлау кілтін таңдап алмадыңыз, ол "
+"хат шифрланса оның шифрын шеше алмайды."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Сіз осы хатты алушылардың кейбіреуі үшін шифрлау кілтін таңдап алмадыңыз, олар "
-"хат шифрланса оның шифрын шеше алмайды."
+"Сіз осы хатты алушылардың кейбіреуі үшін шифрлау кілтін таңдап алмадыңыз, "
+"олар хат шифрланса оның шифрын шеше алмайды."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -162,16 +175,16 @@ msgstr ""
 "Бұл мүмкіндік\n"
 "әлі жоқ"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "GnuPG/PGP орнатылмаған не GnuPG/PGP пайдаланбайды деп таңдалған."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Шифрлау кілтін таңдау"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -183,7 +196,7 @@ msgstr ""
 "\n"
 "Осы алушы үшін қолданатын кілтт(ерд)і қайта таңдаңыз."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -195,7 +208,7 @@ msgstr ""
 "\n"
 "Осы алушы үшін қолданатын кілтт(ерд)і таңдаңыз."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -255,11 +268,11 @@ msgstr "Жарамсыз пароль, қолтаңбаланбайды."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Қолтаңбалау жаңылысы: PGP пайдаланушының іс-әлпетін, PGP баптауын және кілттер "
-"жинақтарыңызды тексеріңіз."
+"Қолтаңбалау жаңылысы: PGP пайдаланушының іс-әлпетін, PGP баптауын және "
+"кілттер жинақтарыңызды тексеріңіз."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -300,11 +313,11 @@ msgstr "Келтірілген пароліңіз дұрыс емес."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Хатыңызды шифрлау үшін қолданам деген кілт(тер)іңізге сенім артылмаған. Шифрлау "
-"жасалмады."
+"Хатыңызды шифрлау үшін қолданам деген кілт(тер)іңізге сенім артылмаған. "
+"Шифрлау жасалмады."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -353,7 +366,7 @@ msgstr "Жарамсыз құпия кілтінің себебінен қолт
 msgid "Error running gpg"
 msgstr "gpg жегу қатесі"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (~/.gnupg/pubring.gpg файлы табылмады)"
 
@@ -369,13 +382,18 @@ msgstr ""
 "\"%1\"\n"
 "үшін OpenPGP паролін келтіріңіз:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP ескертуі"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Шифрлауды іс жүзінде қолданудың алдында, ол шын істейтінін тексеріңіз. Сонымен, "
-"ескеріңіз: PGP/GPG модулі тіркемелерді шифрламайды."
+"Шифрлауды іс жүзінде қолданудың алдында, ол шын істейтінін тексеріңіз. "
+"Сонымен, ескеріңіз: PGP/GPG модулі тіркемелерді шифрламайды."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -409,33 +427,35 @@ msgstr "PGP 6.x нұсқасы"
 msgid "Do not use any encryption tool"
 msgstr "Ешбір шифрлау құралы қолданылмасын"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Паролі жадында &сақталсын"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Бұл белгі қойылса, жеке кілтіңіздің паролі қолдаңба орындалып жатқанша "
-"жатталып алынады. Сонымен оны бір рет қана келтіресіз.</p>"
-"<p>Байқаңыз, бұл қауіпзіздіктің тәуекелі. Егер компьютеріңізден алыстап "
-"кетсеңіз, біреу оны қолданып Сіздің қолтаңбаңызмен хатты жібере алады "
-"немесе/және шифрланған хаттарыңызды оқи алады. Егер дамп жасайтын жағдай болып "
-"қалса, жад мазмұны, паролімен қоса, дискіге жазылады.</p>"
-"<p>Тағы бір ескеретін жайт: KMail-ді қолданғанда бұл параметр тек қана "
-"gpg-agent-ті пайдаланбағанда. Сонымен қатар, крипто плагин модульдерді "
-"пайдаланғанда да осы параметр әсер етпейді.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Бұл белгі қойылса, жеке кілтіңіздің паролі қолдаңба орындалып "
+"жатқанша жатталып алынады. Сонымен оны бір рет қана келтіресіз.</"
+"p><p>Байқаңыз, бұл қауіпзіздіктің тәуекелі. Егер компьютеріңізден алыстап "
+"кетсеңіз, біреу оны қолданып Сіздің қолтаңбаңызмен хатты жібере алады немесе/"
+"және шифрланған хаттарыңызды оқи алады. Егер дамп жасайтын жағдай болып "
+"қалса, жад мазмұны, паролімен қоса, дискіге жазылады.</p><p>Тағы бір "
+"ескеретін жайт: KMail-ді қолданғанда бұл параметр тек қана gpg-agent-ті "
+"пайдаланбағанда. Сонымен қатар, крипто плагин модульдерді пайдаланғанда да "
+"осы параметр әсер етпейді.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -443,16 +463,14 @@ msgstr "Өзі үшін әрқашанда ши&фрлансын"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Белгісі қойылса, хат/файл алушының ашық кілтімен ғана емес, өзіңіздің "
-"кілтіңізбен де шифрланады. Бұл біраз уақыттан кейін хаттың/файлдың шифрін шешу "
-"мүмкіндігі болу үшін істеледі. Жалпы бұл пайдалы таңдау.</p></qt> "
+"<qt><p>Белгісі қойылса, хат/файл алушының ашық кілтімен ғана емес, өзіңіздің "
+"кілтіңізбен де шифрланады. Бұл біраз уақыттан кейін хаттың/файлдың шифрін "
+"шешу мүмкіндігі болу үшін істеледі. Жалпы бұл пайдалы таңдау.</p></qt> "
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -460,16 +478,14 @@ msgstr "Шифрланған/қолтаңбаланған мәтін &көрсе
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Шифрлаудың және қолтаңбалаудың нәтижесі хатты жіберердің алдында жеке "
-"терезеде көрсетіледі. Сонымен, шифрлау тегіс өткеніне көз жетізуге болады.</p>"
-"</qt>"
+"<qt><p>Шифрлаудың және қолтаңбалаудың нәтижесі хатты жіберердің алдында жеке "
+"терезеде көрсетіледі. Сонымен, шифрлау тегіс өткеніне көз жетізуге болады.</"
+"p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -477,16 +493,16 @@ msgstr "Әрқашанда шифрлау кілттер &таңдауы көр�
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Құсбелгісі қойылса, бағдарлама шифрлау үшін таңдауға әрқашанда барлық "
-"кілттердің тізімін көрсетеді. Әйтпесе, ол осы кілт таңдауын, тек жарайтын кілт "
-"таба алмағанда немесе жарайтын кілттер бірнеше болғанда ғана ұсынады.</p></qt>"
+"<qt><p>Құсбелгісі қойылса, бағдарлама шифрлау үшін таңдауға әрқашанда барлық "
+"кілттердің тізімін көрсетеді. Әйтпесе, ол осы кілт таңдауын, тек жарайтын "
+"кілт таба алмағанда немесе жарайтын кілттер бірнеше болғанда ғана ұсынады.</"
+"p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -506,12 +522,10 @@ msgstr "Таңдау жаттап алынсын"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Бұл көзді белгілеп қойсаңыз - таңдау жатап алынады да, ендігәрі "
+"<qt><p>Бұл көзді белгілеп қойсаңыз - таңдау жатап алынады да, ендігәрі "
 "сұралмайды.</p></qt>"
 
 #: kpgpui.cpp:391
@@ -611,6 +625,10 @@ msgstr "OpenPGP кілтін таңдау"
 msgid "Please select an OpenPGP key to use."
 msgstr "Қолданатын OpenPGP кілтін таңдаңыз."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Өзгерту..."
diff --git a/tde-i18n-km/messages/tdepim/libkpgp.po b/tde-i18n-km/messages/tdepim/libkpgp.po
index efba22cfb08..9a75733a8b9 100644
--- a/tde-i18n-km/messages/tdepim/libkpgp.po
+++ b/tde-i18n-km/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2006-05-10 15:41+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,7 +47,7 @@ msgstr "ឃ្លាសម្ងាត់​វែង​ពេក វា​ត�
 msgid "Out of memory."
 msgstr "អស់​សតិ​ ។"
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -43,30 +55,29 @@ msgstr ""
 "អ្នក​គ្រាន់​តែ​បាន​បញ្ចូល​ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ​ប៉ុណ្ណោះ​ ។\n"
 "តើ​អ្នក​ព្យាយាម​ម្តង​ទៀត ឬ​បោះបង់​ និង​​មើល​សារ​ដែល​ពុំ​ទាន់​បាន​​ឌីក្រិប​ឬ ?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "ការ​ព្រមាន PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "ព្យាយាម​ម្តងទៀត"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "អ្នក​បាន​បញ្ចូល​ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ ។​\n"
-"តើ​អ្នក​ចង់​ព្យាយាម​ម្តង​ទៀត បន្ត​ និង​​ទុក​សារ​ដែល​មិន​បាន​ចុះ​ហត្ថលេខា "
-"ឬ​បោះបង់ ?"
+"តើ​អ្នក​ចង់​ព្យាយាម​ម្តង​ទៀត បន្ត​ និង​​ទុក​សារ​ដែល​មិន​បាន​ចុះ​ហត្ថលេខា ឬ​បោះបង់ ?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "ផ្ញើ​ពុំ​បាន​ចុះហត្ថ​លេខា​"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -75,25 +86,25 @@ msgstr ""
 "%1\n"
 "តើ​អ្នក​ចង់​ផ្ញើ​សារ​ដែល​មិន​បាន​ចុះ​ហត្ថលេខា​ ឬ​បោះបង់​ការ​ផ្ញើ​សារ ?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "តើ​អ្នក​ចង់​អ៊ិនគ្រីប ទុកសារ​ដូច​ធម្មតា ឬ​បោះបង់​ការ​ផ្ញើសារ ?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "ការ​ផ្ញើ​បាន​​អ៊ិនគ្រីប"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "ការ​ផ្ញើ​មិន​បាន​អ៊ិនគ្រីប"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -102,11 +113,11 @@ msgstr ""
 "%1\n"
 "តើ​អ្នក​ចង់​ទុកសារ​ដូច​ធម្មតា ឬ​បោះបង់​ការ​ផ្ញើ​សារ ។"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "ផ្ញើ​ជា"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -115,7 +126,7 @@ msgstr ""
 "កំហុស​ដូច​ខាង​ក្រោម​បាន​កើត​ឡើង ៖\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -123,41 +134,35 @@ msgstr ""
 "នេះ​ជា​សារ​កំហុស​របស់ %1 ៖\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
-msgstr ""
-"អ្នក​មិន​បាន​ជ្រើស​កូនសោ​អ៊ិនគ្រីប​សម្រាប់​អ្នក​ទទួល​សារ​នេះ "
-"ដូច្នេះ​សារ​នឹង​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ទេ ។"
+msgstr "អ្នក​មិន​បាន​ជ្រើស​កូនសោ​អ៊ិនគ្រីប​សម្រាប់​អ្នក​ទទួល​សារ​នេះ ដូច្នេះ​សារ​នឹង​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ទេ ។"
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
-msgstr ""
-"អ្នក​មិន​បាន​ជ្រើស​កូនសោ​អ៊ិនគ្រីប​សម្រាប់​អ្នក​ទទួល​សារ​នេះ "
-"ដូច្នេះ​សារ​នឹង​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ទេ ។"
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
+msgstr "អ្នក​មិន​បាន​ជ្រើស​កូនសោ​អ៊ិនគ្រីប​សម្រាប់​អ្នក​ទទួល​សារ​នេះ ដូច្នេះ​សារ​នឹង​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ទេ ។"
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"អ្នក​មិន​បាន​ជ្រើស​កូនសោ​អ៊ិនគ្រីប​​សម្រាប់​អ្នក​ទទួល​ម្នាក់​ក្នុង​ចំណោម​អ្នក​ទទ"
-"ួល​ទាំង​អស់ អ្នក​នោះ​នឹង​​មិន​អាច​ឌិគ្រីប​សារ​បាន​ទេ "
-"ប្រសិន​បើ​អ្នក​អ៊ិនគ្រីប​វា ។"
+"អ្នក​មិន​បាន​ជ្រើស​កូនសោ​អ៊ិនគ្រីប​​សម្រាប់​អ្នក​ទទួល​ម្នាក់​ក្នុង​ចំណោម​អ្នក​ទទួល​ទាំង​អស់ អ្នក​នោះ​នឹង​​មិន​អាច​ឌិគ្រីប​សារ​"
+"បាន​ទេ ប្រសិន​បើ​អ្នក​អ៊ិនគ្រីប​វា ។"
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"អ្នក​មិន​បានជ្រើស​កូនសោ​អ៊ិនគ្រីប​សម្រាប់​អ្នក​ទទួល​មួយ​ចំនួន​ក្នុង​ចំណោម​អ្នក​ទ"
-"ទួល​ទាំង​អស់ អ្នក​ទាំង​នេះ​នឹង​មិន​អាច​ឌិគ្រីប​សារ​បាន​ទេ "
-"ប្រសិន​បើ​អ្នក​អ៊ិនគ្រីប​វា ។"
+"អ្នក​មិន​បានជ្រើស​កូនសោ​អ៊ិនគ្រីប​សម្រាប់​អ្នក​ទទួល​មួយ​ចំនួន​ក្នុង​ចំណោម​អ្នក​ទទួល​ទាំង​អស់ អ្នក​ទាំង​នេះ​នឹង​មិន​អាច​ឌិគ្រីប​"
+"សារ​បាន​ទេ ប្រសិន​បើ​អ្នក​អ៊ិនគ្រីប​វា ។"
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,16 +170,16 @@ msgstr ""
 "លក្ខណៈ​ពិសេស​នេះ​\n"
 "នូវ​តែ​បាត់​"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "អ្នក​​មិន​បាន​ដំឡើង GnuPG/PGP ឬ អ្នក​មិន​​​ប្រើ​ GnuPG/PGP ។"
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "ជម្រើស​កូនសោ​អ៊ិនគ្រីប"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -186,7 +191,7 @@ msgstr ""
 "\n"
 "សូម​ជ្រើស​កូនសោ​ម្ដង​ទៀត ដែល​គួរ​ត្រូវ​បាន​ប្រើ​សម្រាប់​អ្នក​ទទួល​នេះ ។"
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -198,7 +203,7 @@ msgstr ""
 "\n"
 "ជ្រើស​កូនសោ ដែល​គួរ​ត្រូវ​បាន​ប្រើ​សម្រាប់​អ្នក​ទទួល​នេះ ។"
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -236,8 +241,7 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"កូនសោ​សាធារណៈ​មិន​បាន​បញ្ជាក់​​ថា​មាន​ហត្ថលេខា​ដែល​ជឿទុក​ចិត្ត​បានទេ​សម្រាប់​លេខ"
-"​សម្គាល់​អ្នក​ប្រើ\n"
+"កូនសោ​សាធារណៈ​មិន​បាន​បញ្ជាក់​​ថា​មាន​ហត្ថលេខា​ដែល​ជឿទុក​ចិត្ត​បានទេ​សម្រាប់​លេខ​សម្គាល់​អ្នក​ប្រើ\n"
 "%1 ។\n"
 "សារ​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ទេ ។"
 
@@ -247,8 +251,7 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"គ្រាប់​ចុច​សាធារណៈ​ពុំ​មាន​វិញ្ញាបនបត្រ​ជាមួយ​ហត្ថលេខា​ដែល​មិន​ទុក​ចិត្ត​សម្រាប់"
-"​លេខសម្គាល់​អ្នក​ប្រើ​\n"
+"គ្រាប់​ចុច​សាធារណៈ​ពុំ​មាន​វិញ្ញាបនបត្រ​ជាមួយ​ហត្ថលេខា​ដែល​មិន​ទុក​ចិត្ត​សម្រាប់​លេខសម្គាល់​អ្នក​ប្រើ​\n"
 "%1;\n"
 " ជ្រើស​ផ្ទាល់​ខ្លួន​នេះ​នឹង​ មិន​អាច​អាន​សារ​នេះ​បាន​ទេ ។"
 
@@ -258,16 +261,14 @@ msgstr "ឃ្លា​សម្ងាត់​មិន​ល្អ មិន�
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"ការ​ចុះ​ហត្ថលេខា​បាន​បរាជ័យ ៖ សូម​គូសធីក​អត្តសញ្ញាណ​អ្នក​ប្រើ PGP របស់ "
-"ការ​រៀបចំ PGP និង​កង​កូនសោ ។"
+"ការ​ចុះ​ហត្ថលេខា​បាន​បរាជ័យ ៖ សូម​គូសធីក​អត្តសញ្ញាណ​អ្នក​ប្រើ PGP របស់ ការ​រៀបចំ PGP និង​កង​កូនសោ ។"
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
-msgstr ""
-"ការ​អ៊ិនគ្រីប​បាន​បរាជ័យ ៖ សូម​គូសធីក​ការ​រៀបចំ PGP របស់​អ្នក​ និង​កង​កូនសោ ។"
+msgstr "ការ​អ៊ិនគ្រីប​បាន​បរាជ័យ ៖ សូម​គូសធីក​ការ​រៀបចំ PGP របស់​អ្នក​ និង​កង​កូនសោ ។"
 
 #: kpgpbase2.cpp:259 kpgpbase6.cpp:62 kpgpbase6.cpp:360
 msgid "error running PGP"
@@ -303,11 +304,9 @@ msgstr "ឃ្លា​សម្ងាត់​ដែល​អ្នក​បា
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
-msgstr ""
-"កូនសោ​ដែល​អ្នក​ចង់​អ៊ិនគ្រីប​សារ​របស់​អ្នក​គឺ​មិន​គួរ​ឲ្យ​ជឿ​ទុកចិត្ត ។ "
-"គ្មាន​ការ​អ៊ិនគ្រីប​បាន​ធ្វើ ។"
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
+msgstr "កូនសោ​ដែល​អ្នក​ចង់​អ៊ិនគ្រីប​សារ​របស់​អ្នក​គឺ​មិន​គួរ​ឲ្យ​ជឿ​ទុកចិត្ត ។ គ្មាន​ការ​អ៊ិនគ្រីប​បាន​ធ្វើ ។"
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -350,14 +349,13 @@ msgstr "ការ​ចុះ​ហត្ថលេខា​បាន​បរា
 
 #: kpgpbaseG.cpp:190
 msgid "Signing failed because your secret key is unusable."
-msgstr ""
-"ការ​ចុះ​ហត្ថលេខា​បាន​បរាជ័យ ព្រោះថា​កូនសោ​សម្ងាត់​របស់​អ្នក​មិន​អាច​ប្រើ​បាន ។"
+msgstr "ការ​ចុះ​ហត្ថលេខា​បាន​បរាជ័យ ព្រោះថា​កូនសោ​សម្ងាត់​របស់​អ្នក​មិន​អាច​ប្រើ​បាន ។"
 
 #: kpgpbaseG.cpp:221
 msgid "Error running gpg"
 msgstr "កំហុស​ក្នុង​ការ​រត់ gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (ឯកសារ ~/.gnupg/pubring.gpg រក​មិន​ឃើញ​)"
 
@@ -373,15 +371,18 @@ msgstr ""
 "សូម​បញ្ចូល​ឃ្លា​សម្ងាត់ OpenPGP សម្រាប់\n"
 "\"%1\" ៖"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "ការ​ព្រមាន PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"សូម​គូសធីក​ "
-"ប្រសិន​បើ​ការ​អ៊ិនគ្រីប​ពិត​ជា​​ដំណើរ​ការ​មុន​ពេល​អ្នក​ចាប់ផ្ដើម​ប្រើ​វា​​យ៉ាង​ជ"
-"ាក់លាក់ ។ ចំណាំ​ផង​ដែរថា ឯកសារ​ភ្ជាប់​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ដោយ​ម៉ូឌុល "
-"PGP/GPG ទេ ។"
+"សូម​គូសធីក​ ប្រសិន​បើ​ការ​អ៊ិនគ្រីប​ពិត​ជា​​ដំណើរ​ការ​មុន​ពេល​អ្នក​ចាប់ផ្ដើម​ប្រើ​វា​​យ៉ាង​ជាក់លាក់ ។ ចំណាំ​ផង​ដែរថា "
+"ឯកសារ​ភ្ជាប់​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ដោយ​ម៉ូឌុល PGP/GPG ទេ ។"
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -415,38 +416,33 @@ msgstr "PGP កំណែ​ 6.x"
 msgid "Do not use any encryption tool"
 msgstr "កុំប្រើ​ឧបករណ៍​អ៊ិនគ្រីប​ណា​មួយ​"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "រក្សា​ឃ្លា​សម្ងាត់​ក្នុង​សតិ​"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>នៅ​ពេល​ជម្រើស​នេះ​ត្រូវ​បាន​អនុញ្ញាត "
-"ឃ្លាសម្ងាត់​នៃ​កូនសោ​ឯកជន​របស់​អ្នក​នឹង​ត្រូវ​បាន​ចងចាំ​ដោយ​កម្មវិធី "
-"ក្នុង​ករណី​ដេល​កម្មវិធី​​កំពុង​រត់ ។ ដូច្នេះ "
-"អ្នក​នឹង​ត្រូវ​បញ្ចូល​ឃ្លាសម្ងាត់​តែ​ម្ដង​ប៉ុណ្ណោះ ។</p>"
-"<p>សូម​ដឹង​ថា នេះ​អាច​​ប្រឈម​មុខ​នឹង​គ្រោះ​ថ្នាក់​ផ្នែក​សុវត្ថិភាព ។ "
-"ប្រសិន​បើ​អ្នក​ទុក​កុំព្យូទ័រ​របស់​អ្នក​ចោល "
-"អ្នក​ផ្សេង​ទៀត​អាច​ប្រើ​វា​ដើម្បី​សារ​ដែល​បាន​ចុះ​ហត្ថលេខា​ "
-"និង/ឬ​សារ​ដែល​បាន​អ៊ិនគ្រីប ។ ប្រសិន​បើ​វា​កើត​ឡើង "
-"មាតិកា​​សតិ​របស់​អ្នក​នឹង​ត្រូវ​បាន​រក្សាទុក​នៅ​ក្នុង​ថាស​រឹង "
-"រួម​ទាំង​ឃ្លាសម្ងាត់​របស់​អ្នក​ផងដែរ ។</p>"
-"<p>ចំណាំ​ថា នៅ​ពេល​ប្រើ KMail "
-"ការ​កំណត់​នេះ​អនុវត្ត​តែ​ក្នុង​ករណី​ដែល​​អ្នក​មិន​កំពុង​ប្រើ​ភ្នាក់ងារ​របស់ "
-"gpg ។ វា​ក៏​ត្រូវ​បាន​មិន​អើពើ​ផងដែរ​ "
-"ប្រសិន​បើ​អ្នក​កំពុង​ប្រើ​កម្មវិធី​ជំនួយ​របស់ crypto ។</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>នៅ​ពេល​ជម្រើស​នេះ​ត្រូវ​បាន​អនុញ្ញាត ឃ្លាសម្ងាត់​នៃ​កូនសោ​ឯកជន​របស់​អ្នក​នឹង​ត្រូវ​បាន​ចងចាំ​ដោយ​"
+"កម្មវិធី ក្នុង​ករណី​ដេល​កម្មវិធី​​កំពុង​រត់ ។ ដូច្នេះ អ្នក​នឹង​ត្រូវ​បញ្ចូល​ឃ្លាសម្ងាត់​តែ​ម្ដង​ប៉ុណ្ណោះ ។</p><p>សូម​ដឹង​"
+"ថា នេះ​អាច​​ប្រឈម​មុខ​នឹង​គ្រោះ​ថ្នាក់​ផ្នែក​សុវត្ថិភាព ។ ប្រសិន​បើ​អ្នក​ទុក​កុំព្យូទ័រ​របស់​អ្នក​ចោល អ្នក​ផ្សេង​ទៀត​"
+"អាច​ប្រើ​វា​ដើម្បី​សារ​ដែល​បាន​ចុះ​ហត្ថលេខា​ និង/ឬ​សារ​ដែល​បាន​អ៊ិនគ្រីប ។ ប្រសិន​បើ​វា​កើត​ឡើង មាតិកា​​សតិ​របស់​"
+"អ្នក​នឹង​ត្រូវ​បាន​រក្សាទុក​នៅ​ក្នុង​ថាស​រឹង រួម​ទាំង​ឃ្លាសម្ងាត់​របស់​អ្នក​ផងដែរ ។</p><p>ចំណាំ​ថា នៅ​ពេល​ប្រើ "
+"KMail ការ​កំណត់​នេះ​អនុវត្ត​តែ​ក្នុង​ករណី​ដែល​​អ្នក​មិន​កំពុង​ប្រើ​ភ្នាក់ងារ​របស់ gpg ។ វា​ក៏​ត្រូវ​បាន​មិន​អើពើ​"
+"ផងដែរ​ ប្រសិន​បើ​អ្នក​កំពុង​ប្រើ​កម្មវិធី​ជំនួយ​របស់ crypto ។</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -454,18 +450,14 @@ msgstr "តែងតែ​អ៊ិនគ្រីប​​ដោយ​ខ្ល
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>នៅ​ពេល​ជម្រើស​នេះ​ត្រូវ​បាន​អនុញ្ញាត "
-"សារ/ឯកសារ​នឹង​មិន​​ត្រូវ​បាន​អ៊ិនគ្រីប​ជាមួយ​នឹង​កូនសោ​សាធារណៈ​របស់​អ្នក​ទទួល​ប៉"
-"ុណ្ណោះ​ទេ ប៉ុន្តែ​ថែម​ទាំង​ជាមួយ​នឹង​កូនសោ​របស់​អ្នក​ផង​ដែរ ។ "
-"វា​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​ឌិគ្រីប​សារ/ឯកសារ​នៅ​ពេល​ក្រោយ ។ "
-"នេះ​ជា​ទូទៅ​គឺ​ជា​គំនិត​ដ៏​ល្អ​មួយ ។</p></qt>"
+"<qt><p>នៅ​ពេល​ជម្រើស​នេះ​ត្រូវ​បាន​អនុញ្ញាត សារ/ឯកសារ​នឹង​មិន​​ត្រូវ​បាន​អ៊ិនគ្រីប​ជាមួយ​នឹង​កូនសោ​សាធារណៈ​របស់​"
+"អ្នក​ទទួល​ប៉ុណ្ណោះ​ទេ ប៉ុន្តែ​ថែម​ទាំង​ជាមួយ​នឹង​កូនសោ​របស់​អ្នក​ផង​ដែរ ។ វា​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​ឌិគ្រីប​សារ/ឯកសារ​"
+"នៅ​ពេល​ក្រោយ ។ នេះ​ជា​ទូទៅ​គឺ​ជា​គំនិត​ដ៏​ល្អ​មួយ ។</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -473,20 +465,14 @@ msgstr "បង្ហាញ​អត្ថបទ​ដែល​បាន​ចុ
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p>នៅ​ពេល​ជម្រើស​ត្រូវ​បាន​អនុញ្ញាត "
-"អត្ថបទ​ដែល​បាន​ចុះ​ហត្ថលេខា/អ៊ិនគ្រីប​នឹង​ត្រូវ​បាន​បង្ហាញ​ក្នុង​បង្អួច​ដោយ​ឡែក​"
-"មួយ "
-"ដោយ​អនុញ្ញាត​ឲ្យ​អ្នក​ដឹង​ពី​វិធី​ដែល​វា​នឹង​មាន​រូបរាង​​មុន​ពេល​​ផ្ញើ​ចេញ ។ "
-"នេះ​ជា​គំនិត​ដ៏​ល្អ​ "
-"នៅ​ពេល​អ្នក​កំពុង​ផ្ទៀងផ្ទាត់​ថា​ប្រព័ន្ធ​អ៊ិនគ្រីប​របស់​អ្នក​ដំណើរការ ។</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
+msgstr ""
+"<qt><p>នៅ​ពេល​ជម្រើស​ត្រូវ​បាន​អនុញ្ញាត អត្ថបទ​ដែល​បាន​ចុះ​ហត្ថលេខា/អ៊ិនគ្រីប​នឹង​ត្រូវ​បាន​បង្ហាញ​ក្នុង​បង្អួច​"
+"ដោយ​ឡែក​មួយ ដោយ​អនុញ្ញាត​ឲ្យ​អ្នក​ដឹង​ពី​វិធី​ដែល​វា​នឹង​មាន​រូបរាង​​មុន​ពេល​​ផ្ញើ​ចេញ ។ នេះ​ជា​គំនិត​ដ៏​ល្អ​ នៅ​ពេល​អ្នក​"
+"កំពុង​ផ្ទៀងផ្ទាត់​ថា​ប្រព័ន្ធ​អ៊ិនគ្រីប​របស់​អ្នក​ដំណើរការ ។</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -494,19 +480,15 @@ msgstr "តែងតែ​បង្ហាញ​កូនសោ​អ៊ិនគ
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>នៅ​ពេល​ជម្រើស​នេះ​ត្រូវ​បាន​អនុញ្ញាត "
-"កម្មវិធី​នឹង​បង្ហាញ​អ្នក​នូវ​បញ្ជី​កូនសោ​សាធារណៈ​ជា​និច្ច​ "
-"ដែល​អ្នក​អាច​ជ្រើស​​វា​​មួយ​ វា​នឹង​ប្រើ​សម្រាប់​អ៊ិនគ្រីប ។ "
-"ប្រសិន​បើ​វា​ត្រូវ​បានបិទ កម្មវិធី​នឹង​បង្ហាញ​តែ​ប្រអប់​ "
-"ប្រសិន​បើ​វា​មិន​អាច​រក​កូនសោ​ត្រឹមត្រូវ ឬ​ប្រសិន​បើ​មាន​កូនសោ​ច្រើន "
-"ដែល​គួរ​ត្រូវ​បាន​ប្រើ ។ </p></qt>"
+"<qt><p>នៅ​ពេល​ជម្រើស​នេះ​ត្រូវ​បាន​អនុញ្ញាត កម្មវិធី​នឹង​បង្ហាញ​អ្នក​នូវ​បញ្ជី​កូនសោ​សាធារណៈ​ជា​និច្ច​ ដែល​អ្នក​"
+"អាច​ជ្រើស​​វា​​មួយ​ វា​នឹង​ប្រើ​សម្រាប់​អ៊ិនគ្រីប ។ ប្រសិន​បើ​វា​ត្រូវ​បានបិទ កម្មវិធី​នឹង​បង្ហាញ​តែ​ប្រអប់​ ប្រសិន​បើ​វា​"
+"មិន​អាច​រក​កូនសោ​ត្រឹមត្រូវ ឬ​ប្រសិន​បើ​មាន​កូនសោ​ច្រើន ដែល​គួរ​ត្រូវ​បាន​ប្រើ ។ </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -526,13 +508,11 @@ msgstr "ជម្រើស​ចងចាំ"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>ប្រសិន​បើ​អ្នក​គូសធីក​ប្រអប់​នេះ ជម្រើស​របស់​អ្នក​នឹង​ត្រូវ​បាន​រក្សាទុក "
-"ហើយ​អ្នក​នឹង​ត្រូវ​បាន​សួរ​ម្ដង​ទៀត​ទេ ។</p></qt>"
+"<qt><p>ប្រសិន​បើ​អ្នក​គូសធីក​ប្រអប់​នេះ ជម្រើស​របស់​អ្នក​នឹង​ត្រូវ​បាន​រក្សាទុក ហើយ​អ្នក​នឹង​ត្រូវ​បាន​សួរ​ម្ដង​ទៀត​"
+"ទេ ។</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -631,6 +611,10 @@ msgstr "ជម្រើស​កូនសោ OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "សូម​ជ្រើស​កូនសោ OpenPGP មួយ​ត្រូវ​ប្រើ ។"
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "ផ្លាស់ប្ដូរ..."
@@ -694,8 +678,7 @@ msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
-msgstr ""
-"ជ្រើស​កូនសោ ​ដែល​គួរ​ត្រូវ​បាន​ប្រើ​ដើម្បី​អ៊ិនគ្រីប​សារ​ដោយ​ខ្លួន​ឯង ។"
+msgstr "ជ្រើស​កូនសោ ​ដែល​គួរ​ត្រូវ​បាន​ប្រើ​ដើម្បី​អ៊ិនគ្រីប​សារ​ដោយ​ខ្លួន​ឯង ។"
 
 #: kpgpui.cpp:1543
 #, c-format
diff --git a/tde-i18n-ko/messages/tdepim/libkpgp.po b/tde-i18n-ko/messages/tdepim/libkpgp.po
index 406f219027a..1dddda8289c 100644
--- a/tde-i18n-ko/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ko/messages/tdepim/libkpgp.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2004-11-08 14:11+0900\n"
 "Last-Translator: root <root@localhost.localdomain>\n"
 "Language-Team:  <ko@li.org>\n"
@@ -21,6 +21,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -41,64 +53,68 @@ msgstr "암호문 너무 깁니다. 1024자 이하여야 합니다."
 msgid "Out of memory."
 msgstr "메모리 부족"
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 "무효한 암호문를 입력하셨습니다.\n"
-"다시 시도하시겠습니까, 아니면 취소하고 암호화 해제가 되지 않은 채 메시지를 보시겠습니까?"
+"다시 시도하시겠습니까, 아니면 취소하고 암호화 해제가 되지 않은 채 메시지를 보"
+"시겠습니까?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP 경고"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "재시도(&R)"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "무효한 암호문를 입력하셨습니다.\n"
-"다시 시도하여 계속하여 메시지를 서명하지 않은 채로 두겠습니까, 아니면 메시지 전송을 취소하시겠습니까?"
+"다시 시도하여 계속하여 메시지를 서명하지 않은 채로 두겠습니까, 아니면 메시지 "
+"전송을 취소하시겠습니까?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "서명하지 않은 채 보내기(&U)"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"메시지를 서명하지 않은 채로 보내시겠습니까, 아니면 메시지 전송을 취소하시겠습니까?"
+"메시지를 서명하지 않은 채로 보내시겠습니까, 아니면 메시지 전송을 취소하시겠습"
+"니까?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"그냥 암호화 하여 메시지를 원래대로 두겠습니까, 아니면 메시지 전송을 취소하시겠습니까?"
+"그냥 암호화 하여 메시지를 원래대로 두겠습니까, 아니면 메시지 전송을 취소하시"
+"겠습니까?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "암호화하여 전송(&E)"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "암호화하지 않고 전송(&U)"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -107,11 +123,11 @@ msgstr ""
 "%1\n"
 "메시지를 원래대로 두겠습니까, 아니면 메시지 전송을 취소하시겠습니까?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "원래대로 보내기(&S)"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -120,7 +136,7 @@ msgstr ""
 "다음의 오류가 발생했습니다.:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -128,33 +144,39 @@ msgstr ""
 "%1 의 오류 메시지 입니다.:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
-msgstr "이 메시지의 수신인을 위한 암호키를 선택하지 않으셨습니다. 그러므로, 메시지는 암호화되지 않습니다."
+msgstr ""
+"이 메시지의 수신인을 위한 암호키를 선택하지 않으셨습니다. 그러므로, 메시지는 "
+"암호화되지 않습니다."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
-msgstr "이 메시지의 모든 수신인에 대하여 암호키를 선택하지 않으셨습니다. 그러므로, 메시지는 암호화되지 않습니다."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
+msgstr ""
+"이 메시지의 모든 수신인에 대하여 암호키를 선택하지 않으셨습니다. 그러므로, 메"
+"시지는 암호화되지 않습니다."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"이 메시지의 수신인 중 한 명의 암호키를 선택하지 않으셨습니다. 이 사람은 당신이 메시지를 암호화하여 보낸다면 그것을 해제할 수 없습니다."
+"이 메시지의 수신인 중 한 명의 암호키를 선택하지 않으셨습니다. 이 사람은 당신"
+"이 메시지를 암호화하여 보낸다면 그것을 해제할 수 없습니다."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"이 메시지의 수신인 중 몇 명의 암호키를 선택하지 않으셨습니다. 이들은 당신이 메시지를 암호화하여 보낸다면 그것을 해제할 수 없습니다."
+"이 메시지의 수신인 중 몇 명의 암호키를 선택하지 않으셨습니다. 이들은 당신이 "
+"메시지를 암호화하여 보낸다면 그것을 해제할 수 없습니다."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -162,16 +184,17 @@ msgstr ""
 "이 부분이 \n"
 "여전히 비어있습니다."
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
-msgstr "GnuPG/PGP를 설치하지 않았거나, GnuPG/PGP를 사용하지 않도록 선택했습니다."
+msgstr ""
+"GnuPG/PGP를 설치하지 않았거나, GnuPG/PGP를 사용하지 않도록 선택했습니다."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "암호 키 선택"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -183,7 +206,7 @@ msgstr ""
 "\n"
 "이 수신인들을 위한 암호 키들을 다시 선택해 주십시오."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -195,7 +218,7 @@ msgstr ""
 "\n"
 "이 수신인들을 위해 사용될 키들을 선택해 주십시오."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -253,8 +276,8 @@ msgstr "올바르지 않은 암호문입니다. 서명할 수 없습니다."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr "서명 실패: PGP 사용자 증명, PGP 설정, 키 모음을 확인하십시오."
 
 #: kpgpbase2.cpp:213
@@ -295,9 +318,10 @@ msgstr "입력한 암호문이 유효하지 않습니다."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
-msgstr "메시지를 암호화하려는 키들이 믿을 수 없는 키입니다. 암호화되지 않았습니다."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
+msgstr ""
+"메시지를 암호화하려는 키들이 믿을 수 없는 키입니다. 암호화되지 않았습니다."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -346,7 +370,7 @@ msgstr "비밀 키를 사용할 수 없어 서명이 실패했습니다."
 msgid "Error running gpg"
 msgstr "gpg 실행 오류"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? ( ~/.gnupg/pubring.gpg 파일을 찾을 수 없습니다.)"
 
@@ -362,11 +386,18 @@ msgstr ""
 "아래에 대한 OpenPGP 암호문을 입력하십시오.\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP 경고"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
-msgstr "사용하기 전에 암호화가 제대로 진행되는지 꼭 확인하십시오. 또한 PGP/GPG 모듈에서는 첨부파일이 암호화되지 않습니다."
+msgstr ""
+"사용하기 전에 암호화가 제대로 진행되는지 꼭 확인하십시오. 또한 PGP/GPG 모듈에"
+"서는 첨부파일이 암호화되지 않습니다."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -400,31 +431,34 @@ msgstr "PGP 버전 6.x"
 msgid "Do not use any encryption tool"
 msgstr "아무 암호화 도구도 사용하지 않음"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "암호문 메모리에 저장하기(&K)"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>이 옵션이 사용되면, 응용프로그램이 실행되는 동안은 사용자의 개인키 암호문이 저장됩니다. 그렇게 하면 암호문을 한 번만 입력하면 됩니다. "
-"</p> "
-"<p>이 옵션이 보안 유출로 이어질 수 있음을 주의하십시오. 사용자가 컴퓨터 앞을 떠나면 다른 사람이 이를 이용하여 서명된 메시지를 보낼 수도 "
-"있으며 암호화된 사용자의 메시지도 읽을 수 있습니다. 컴퓨터가 오래된 파일을 소거하려 하면, 램에 있던 정보들이, 사용자의 암호문까지 포함하여 "
-"디스크에 저장됩니다. </p>"
-"<p>K메일에서는 gpg 방식을 사용하지 않을 때만 이 설정이 적용됩니다. 비밀 플러그 인을 사용할 때에도 저장된 암호문은 무시됩니다.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>이 옵션이 사용되면, 응용프로그램이 실행되는 동안은 사용자의 개인키 암"
+"호문이 저장됩니다. 그렇게 하면 암호문을 한 번만 입력하면 됩니다. </p> <p>이 "
+"옵션이 보안 유출로 이어질 수 있음을 주의하십시오. 사용자가 컴퓨터 앞을 떠나"
+"면 다른 사람이 이를 이용하여 서명된 메시지를 보낼 수도 있으며 암호화된 사용자"
+"의 메시지도 읽을 수 있습니다. 컴퓨터가 오래된 파일을 소거하려 하면, 램에 있"
+"던 정보들이, 사용자의 암호문까지 포함하여 디스크에 저장됩니다. </p><p>K메일에"
+"서는 gpg 방식을 사용하지 않을 때만 이 설정이 적용됩니다. 비밀 플러그 인을 사"
+"용할 때에도 저장된 암호문은 무시됩니다.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -432,15 +466,14 @@ msgstr "항상 스스로 암호화(&Y)"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이 옵션을 사용하면, 받는 사람의 공용키 뿐만 아니라 보내는 이의 키도 이용하여 메시지/파일을 암호화합니다. 이는 나중에 보내는 이가 "
-"메시지/파일을 해독할 수도 있게 합니다. 이는 보통 권장됩니다.</p></qt>"
+"<qt><p>이 옵션을 사용하면, 받는 사람의 공용키 뿐만 아니라 보내는 이의 키도 이"
+"용하여 메시지/파일을 암호화합니다. 이는 나중에 보내는 이가 메시지/파일을 해독"
+"할 수도 있게 합니다. 이는 보통 권장됩니다.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -448,15 +481,14 @@ msgstr "서명된/암호화된 텍스트를 조립한 후 보기(&S)"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>이 옵션을 사용하면, 서명된/암호화된 텍스트를 떨어진 창에 나타내, 보내지기 전에 어떻게 보이게 될지 알 수 있게 해줍니다. 암호화 "
-"시스템이 어떻게 작동하는지 확인할 때 유용합니다.</p></qt>"
+"<qt><p>이 옵션을 사용하면, 서명된/암호화된 텍스트를 떨어진 창에 나타내, 보내"
+"지기 전에 어떻게 보이게 될지 알 수 있게 해줍니다. 암호화 시스템이 어떻게 작동"
+"하는지 확인할 때 유용합니다.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -464,15 +496,16 @@ msgstr "허가할 때 항상 암호화 키 보기(&F)"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>이 옵션을 사용하면, 항상 응용프로그램이 선택할 수 있는 암호화키를 보여주고 그 중에 하나를 선택하여, 암호화하도록 할 수 있게 "
-"해줍니다. 사용하지 않으면, 알맞은 키를 찾을 수 없거나 여러가지 키가 가능할 때에만 대화창을 띄웁니다. </p></qt>"
+"<qt><p>이 옵션을 사용하면, 항상 응용프로그램이 선택할 수 있는 암호화키를 보여"
+"주고 그 중에 하나를 선택하여, 암호화하도록 할 수 있게 해줍니다. 사용하지 않으"
+"면, 알맞은 키를 찾을 수 없거나 여러가지 키가 가능할 때에만 대화창을 띄웁니"
+"다. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -492,10 +525,10 @@ msgstr "선택 기억하기"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
-msgstr "<qt><p>선택하면, 선택한 정보가 저장되고 다시 묻지 않을 것입니다.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
+msgstr ""
+"<qt><p>선택하면, 선택한 정보가 저장되고 다시 묻지 않을 것입니다.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -594,6 +627,10 @@ msgstr "OpenPGP 키 선택"
 msgid "Please select an OpenPGP key to use."
 msgstr "사용할 OpenPGP 키를 선택하십시오."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "변경..."
diff --git a/tde-i18n-lt/messages/tdepim/libkpgp.po b/tde-i18n-lt/messages/tdepim/libkpgp.po
index 586ab86276c..a7cb2c7cae1 100644
--- a/tde-i18n-lt/messages/tdepim/libkpgp.po
+++ b/tde-i18n-lt/messages/tdepim/libkpgp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-09-02 17:30+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -16,8 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
 
 #: kpgp.cpp:187
 msgid ""
@@ -39,7 +51,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Trūksta atminties."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -48,30 +60,30 @@ msgstr ""
 "Ar norite pamėginti iš naujo, ar atšaukti bandymą ir skaityti laišką "
 "neiššifruotą?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP perspėjimas"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Iš naujo"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Įvesta neteisinga slaptoji frazė.\n"
-"Ar norite pamėginti iš naujo, tęsti ir palikti laišką nepasirašytą, ar atšaukti "
-"bandymą išsiųsti laišką?"
+"Ar norite pamėginti iš naujo, tęsti ir palikti laišką nepasirašytą, ar "
+"atšaukti bandymą išsiųsti laišką?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Siųsti &nepasirašytą"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -80,34 +92,34 @@ msgstr ""
 "%1\n"
 "Ar norite siųsti laišką nepasirašytą, ar atšaukti laiško siuntimą?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Siųsti ši&fruotą"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Siųsti &nešifruotą"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Siųsti k&aip yra"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -116,7 +128,7 @@ msgstr ""
 "Įvyko klaida:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -124,7 +136,7 @@ msgstr ""
 "Čia yra klaidos pranešimas %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -132,15 +144,15 @@ msgstr ""
 "Jūs nepriskyrėte šifravimo rakto šio laiško gavėjui, todėl laiškas bus "
 "siunčiamas neužšifruotas."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Jūs nepriskyrėte šifravimo rakto nei vienam iš šio laiško gavėjų, todėl laiškas "
-"bus siunčiamas neužšifruotas."
+"Jūs nepriskyrėte šifravimo rakto nei vienam iš šio laiško gavėjų, todėl "
+"laiškas bus siunčiamas neužšifruotas."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -148,7 +160,7 @@ msgstr ""
 "Vienam iš gavėjų nepasirinkote šifravimo rakto; šis asmuo negalės iššifruoti "
 "laiško, jei jį užšifruosite."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -156,7 +168,7 @@ msgstr ""
 "Keletui gavėjų neparinkote šifravimo rakto; šie asmenys negalės iššifruoti "
 "laiško, jei jį užšifruosite."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -164,18 +176,18 @@ msgstr ""
 "Šios programos galimybės\n"
 "dar nėra"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
-"Arba kompiuteryje nėra įdiegtas GnuPG/PGP, arba pasirinkote nenaudoti "
-"GnuPG/PGP."
+"Arba kompiuteryje nėra įdiegtas GnuPG/PGP, arba pasirinkote nenaudoti GnuPG/"
+"PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Šifravimo rakto pasirinkimas"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 #, fuzzy
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
@@ -195,7 +207,7 @@ msgstr ""
 "Prašome iš naujo pasirinkti raktą(-us), kuris turi būti naudojamas šiam "
 "gavėjui."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -207,7 +219,7 @@ msgstr ""
 "\n"
 "Pasirinkite raktą(-us), kuris turi būti naudojamas šiam gavėjui."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 #, fuzzy
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
@@ -271,8 +283,8 @@ msgstr "Neteisinga slaptoji frazė; neįmanoma pasirašyti."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Pasirašymas nepavyko: prašome patikrinti savo PGP naudotojo tapatybę, PGP "
 "sąranką bei raktų žiedus."
@@ -316,8 +328,8 @@ msgstr "Įvesta slaptoji frazė neteisinga."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Raktas(-ai) kuriems norite užšifruoti laišką nėra patikimi. Laiškas "
 "nešifruojamas. "
@@ -369,7 +381,7 @@ msgstr "Pasirašyti nepavyko nes Jūsų slaptasis raktas nenaudotinas."
 msgid "Error running gpg"
 msgstr "Klaida vykdant gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (byla ~/.gnupg/pubring.gpg nerasta)"
 
@@ -385,13 +397,19 @@ msgstr ""
 "Prašome įvesti OpenPGP slaptają frazę\n"
 "„%1“:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP perspėjimas"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Prieš pradėdami rimtai naudoti šifravimą patikrinkite, ar jis iš tiesų veikia. "
-"Taip pat atkriepkite dėmesį, kad priedai nėra PGP/GPG modulio šifruojami."
+"Prieš pradėdami rimtai naudoti šifravimą patikrinkite, ar jis iš tiesų "
+"veikia. Taip pat atkriepkite dėmesį, kad priedai nėra PGP/GPG modulio "
+"šifruojami."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -425,34 +443,35 @@ msgstr "PGP versija 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Nenaudoti jokio šifravimo įrankio"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Laikyti slaptąją frazę atmintyje"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Įgalinus šią parinktį slaptoji Jūsų asmeninio rakto frazė programos bus "
-"įsiminta tol, kol programa veikia. Taigi slaptąją frazę turėsite įvesti tik "
-"kartą. </p>"
-"<p>Atkreipkite dėmesį į tai, kad tokia programos elgsena laikytina saugumo "
-"rizika. Jei paliksite kompiuterį neprižiūrėtą, kiti galės siųsti pasirašytus "
-"laiškus ir/ar skaityti užšifruotus Jūsų laiškus. Jei įvyks „core dump“, RAM "
-"turinys, įskaitant ir Jūsų slaptąją frazę, bus išsaugotas į diską.</p>"
-"<p>Taip pat atkreipkite dėmesį, kad, naudojant KMail, ši parinktis galima tik "
-"nenaudojant gpg-agent. Ji taip pat bus ignoruojama jei naudojate šifravimo "
-"įskiepius.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Įgalinus šią parinktį slaptoji Jūsų asmeninio rakto frazė programos "
+"bus įsiminta tol, kol programa veikia. Taigi slaptąją frazę turėsite įvesti "
+"tik kartą. </p><p>Atkreipkite dėmesį į tai, kad tokia programos elgsena "
+"laikytina saugumo rizika. Jei paliksite kompiuterį neprižiūrėtą, kiti galės "
+"siųsti pasirašytus laiškus ir/ar skaityti užšifruotus Jūsų laiškus. Jei "
+"įvyks „core dump“, RAM turinys, įskaitant ir Jūsų slaptąją frazę, bus "
+"išsaugotas į diską.</p><p>Taip pat atkreipkite dėmesį, kad, naudojant KMail, "
+"ši parinktis galima tik nenaudojant gpg-agent. Ji taip pat bus ignoruojama "
+"jei naudojate šifravimo įskiepius.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -460,16 +479,14 @@ msgstr "Visada šifruoti &sau pačiam"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Įgalinus šią parinktį, laiškas/byla bus šifruojama ne tik gavėjo viešuoju "
-"raktu, bet ir Jūsų raktu. Tai leis Jums vėliau dešifruoti laišką/bylą. Naudoti "
-"šią parinktį yra gera mintis.</p></qt>"
+"<qt><p>Įgalinus šią parinktį, laiškas/byla bus šifruojama ne tik gavėjo "
+"viešuoju raktu, bet ir Jūsų raktu. Tai leis Jums vėliau dešifruoti laišką/"
+"bylą. Naudoti šią parinktį yra gera mintis.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -477,17 +494,15 @@ msgstr "&Rodyti pasirašytą/šifruotą tekstą po sukūrimo"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Įgalinus šią parinktį pasirašytas/šifruotas tekstas bus rodomas atskirame "
-"lange; taip galėsite pamatyti, kaip jis atrodys prieš tai, kai bus išsiųstas. "
-"įjungti šią parinktį yra gerai norint patikrinti, ar šifravimo sistema tikrai "
-"veikia.</p></qt>"
+"<qt><p>Įgalinus šią parinktį pasirašytas/šifruotas tekstas bus rodomas "
+"atskirame lange; taip galėsite pamatyti, kaip jis atrodys prieš tai, kai bus "
+"išsiųstas. įjungti šią parinktį yra gerai norint patikrinti, ar šifravimo "
+"sistema tikrai veikia.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -496,16 +511,15 @@ msgstr "Visuomet rodyti šifravimo raktus &patvirtinimui"
 #: kpgpui.cpp:205
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
 "#-#-#-#-#  libkpgp.po (libkpgp)  #-#-#-#-#\n"
 "#-#-#-#-#  libtdenetwork.po (libtdenetwork)  #-#-#-#-#\n"
-"<qt>"
-"<p> yra įjungta yra išj. arba</p></qt>"
+"<qt><p> yra įjungta yra išj. arba</p></qt>"
 
 #: kpgpui.cpp:327
 #, fuzzy
@@ -526,13 +540,11 @@ msgstr "Prisiminti pasirinkimą"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jei pažymėsite šią dėžutę Jūsų pasirinkimas bus įsimintas ir ateityje to "
-"nebebus klausiama.</p></qt>"
+"<qt><p>Jei pažymėsite šią dėžutę Jūsų pasirinkimas bus įsimintas ir ateityje "
+"to nebebus klausiama.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -634,6 +646,10 @@ msgstr "OpenPGP rakto pasirinkimas"
 msgid "Please select an OpenPGP key to use."
 msgstr "Prašome pasirinkti OpenPGP raktą naudojimui."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Pakeisti..."
diff --git a/tde-i18n-mk/messages/tdepim/libkpgp.po b/tde-i18n-mk/messages/tdepim/libkpgp.po
index 695c24d589d..94bbc6aa9de 100644
--- a/tde-i18n-mk/messages/tdepim/libkpgp.po
+++ b/tde-i18n-mk/messages/tdepim/libkpgp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-02-17 12:34+0100\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -36,7 +48,7 @@ msgstr "Реченицата за премин е предолга. Мора д�
 msgid "Out of memory."
 msgstr "Без меморија."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -45,30 +57,30 @@ msgstr ""
 "Дали сакате да се обидете повторно или да се откажете и да ја прегледате "
 "пораката криптирана?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP предупредување"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Обидете се повторно"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Внесовте невалидна реченица за премин.\n"
-"Дали сакате да се обидете повторно и да ја оставите пораката непотпишана или да "
-"се откажите од испраќањето на пораката?"
+"Дали сакате да се обидете повторно и да ја оставите пораката непотпишана или "
+"да се откажите од испраќањето на пораката?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Испрати &Непотпишано"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -78,40 +90,40 @@ msgstr ""
 "Дали сакате да ја испратите пораката непотпишана или да се откажете од "
 "испраќањето на пораката?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Дали сакате да криптирате и покрај тоа, да ја оставите пораката како што е или "
-"да прекинете со испраќање на пораката?"
+"Дали сакате да криптирате и покрај тоа, да ја оставите пораката како што е "
+"или да прекинете со испраќање на пораката?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Испрати &Криптирано"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Испрати &Некриптирано"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Дали сакате да ја оставите пораката како што е или да прекинете со испраќање на "
-"пораката?"
+"Дали сакате да ја оставите пораката како што е или да прекинете со испраќање "
+"на пораката?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Испрати како што е"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -120,7 +132,7 @@ msgstr ""
 "Следнава грешка се појави:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -128,39 +140,39 @@ msgstr ""
 "Ова е пораката со грешка од %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Не одбравте клуч за криптирање за примачот на оваа порака; поради тоа пораката "
-"нема да биде криптирана."
+"Не одбравте клуч за криптирање за примачот на оваа порака; поради тоа "
+"пораката нема да биде криптирана."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Не одбра клуч за криптирање за некој од примачите на оваа порака; поради тоа "
 "пораката нема да биде криптирана."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Не одбравте клуч за криптирање за еден од примачите; таа личност нема да може "
-"да ја декриптира пораката ако ја енкриптирате."
+"Не одбравте клуч за криптирање за еден од примачите; таа личност нема да "
+"може да ја декриптира пораката ако ја енкриптирате."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Не избравте клучеви за криптирање на некои од примачите; тие личности нема да "
-"можат да ја декриптираат пораката ако ја енкриптирате."
+"Не избравте клучеви за криптирање на некои од примачите; тие личности нема "
+"да можат да ја декриптираат пораката ако ја енкриптирате."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -168,16 +180,16 @@ msgstr ""
 "Ова својство\n"
 "сè уште недостасува"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "Или немате GnuPG/PGP или имате избрано да не користите GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Избор на клучеви за криптирање"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -189,7 +201,7 @@ msgstr ""
 "\n"
 "Изберете ги повторно клучевите кои треба да се употребат за овој примач."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -201,7 +213,7 @@ msgstr ""
 "\n"
 "Изберете ги повторно клучевите кои треба да се употребат за овој примач."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -259,8 +271,8 @@ msgstr "Неточна реченица за премин, не можам да
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Потпишувањето не успеа: проверете го Вашиот PGP идентитет на корисникот, PGP "
 "поставувањата и клучните прстени."
@@ -268,7 +280,8 @@ msgstr ""
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
 msgstr ""
-"Криптирањето не успеа: проверете ги вашите PGP поставувања и клучните прстени."
+"Криптирањето не успеа: проверете ги вашите PGP поставувања и клучните "
+"прстени."
 
 #: kpgpbase2.cpp:259 kpgpbase6.cpp:62 kpgpbase6.cpp:360
 msgid "error running PGP"
@@ -304,11 +317,11 @@ msgstr "Реченицата за премин која ја несовте не
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Клуч(евите) кои со сакате да ја криптирате вашата порака не се доверливи. Не е "
-"извршено криптирање."
+"Клуч(евите) кои со сакате да ја криптирате вашата порака не се доверливи. Не "
+"е извршено криптирање."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -357,7 +370,7 @@ msgstr "Потпишувањето не успеа бидејќи Вашиот �
 msgid "Error running gpg"
 msgstr "Грешка при извршувањето на gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (датотеката ~/.gnupg/pubring.gpg не е пронајдена)"
 
@@ -373,13 +386,19 @@ msgstr ""
 "Внесете ја OpenPGP реченицата за премин за\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP предупредување"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Проверете дали криптирањето работи пред да започнете да го користите сериозно. "
-"Исто така забележете дека прилозите не се криптирани од PGP/GPG модулот."
+"Проверете дали криптирањето работи пред да започнете да го користите "
+"сериозно. Исто така забележете дека прилозите не се криптирани од PGP/GPG "
+"модулот."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -413,35 +432,36 @@ msgstr "PGP Version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Не користи алатка за криптирање"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Чувај ја реченицата за премин во меморија"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Кога оваа опција е овозможена, реченицата за премин на вашиот приватен клуч "
-"ќе биде запомнета од апликацијата се додека апликацијата е подигната. Значи ќе "
-"треба да ја внесите реченицата за премин само еднаш.</p>"
-"<p>Имајте во предвид дека ова може да претставува ризик за сигурноста. Ако го "
-"оставите Вашиот компјутер други ќе можат да го користат за испраќање на "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Кога оваа опција е овозможена, реченицата за премин на вашиот "
+"приватен клуч ќе биде запомнета од апликацијата се додека апликацијата е "
+"подигната. Значи ќе треба да ја внесите реченицата за премин само еднаш.</"
+"p><p>Имајте во предвид дека ова може да претставува ризик за сигурноста. Ако "
+"го оставите Вашиот компјутер други ќе можат да го користат за испраќање на "
 "потпишани пораки и да ги читаат вашите енкриптирани пораки. Ако дојде до "
 "исфрлање од јадрото, содржината од RAM меморијата ќе биде зачувана на тврд "
-"диск, вклучувајќи ја и реченицата за премин.</p>"
-"<p>Заприметете дека при користење на KMail ова поставување се однесува само ако "
-"не користите gpg-agent. Исто така е игнорирано ако користите crypto "
-"приклучоци.</p></qt>"
+"диск, вклучувајќи ја и реченицата за премин.</p><p>Заприметете дека при "
+"користење на KMail ова поставување се однесува само ако не користите gpg-"
+"agent. Исто така е игнорирано ако користите crypto приклучоци.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -449,16 +469,14 @@ msgstr "Секогаш крип&тирај само"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кога оваа опција е овозможена, пораката/датотеката нема само да биде "
-"криптирана со јавниот клуч на примачот но и со твоиот клуч. Тоа ќе овозможи да "
-"декриптирате пораки/датотеки подоцна. Тоа општо добра идеа.</p></qt>"
+"<qt><p>Кога оваа опција е овозможена, пораката/датотеката нема само да биде "
+"криптирана со јавниот клуч на примачот но и со твоиот клуч. Тоа ќе овозможи "
+"да декриптирате пораки/датотеки подоцна. Тоа општо добра идеа.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -466,17 +484,15 @@ msgstr "&Прикажи потпишан/криптиран текст по со
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Кога оваа опција е овозможена, потпишаниот/криптираниот текст ќе биде "
-"прикажан во посебен прозорец кој Ви овозможува да знаете како ќе изгледа пред "
-"да биде пратено Тоа е добра идеа кога проверуваш дали системот за криптирање "
-"работи.</p></qt>"
+"<qt><p>Кога оваа опција е овозможена, потпишаниот/криптираниот текст ќе биде "
+"прикажан во посебен прозорец кој Ви овозможува да знаете како ќе изгледа "
+"пред да биде пратено Тоа е добра идеа кога проверуваш дали системот за "
+"криптирање работи.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -484,18 +500,17 @@ msgstr "Секогаш приккажи ги клучовите за енкри�
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Кога оваа опција е овозможена апликацијата секогаш ќе прикажува листа со "
-"јавни клучеви од кои можете да изберете еден кој ќе го користите за енкрипција. "
-"Ако е исклучена, апликацијата ќе го прикажи дијалогот само ако не може да го "
-"најде правилниот клуч или има повеќе клучеви кои можат да бидат употребени </p>"
-"</qt>"
+"<qt><p>Кога оваа опција е овозможена апликацијата секогаш ќе прикажува листа "
+"со јавни клучеви од кои можете да изберете еден кој ќе го користите за "
+"енкрипција. Ако е исклучена, апликацијата ќе го прикажи дијалогот само ако "
+"не може да го најде правилниот клуч или има повеќе клучеви кои можат да "
+"бидат употребени </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -515,13 +530,11 @@ msgstr "Запамети го изборот"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ако го обележите ова поле вашиот избор ќе биде зачуван и нема да бидете "
-"прашани повторно.</p></qt>"
+"<qt><p>Ако го обележите ова поле вашиот избор ќе биде зачуван и нема да "
+"бидете прашани повторно.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -620,6 +633,10 @@ msgstr "Избор на OpenPGP клуч"
 msgid "Please select an OpenPGP key to use."
 msgstr "Изберете OpenPGP клуч на употреба."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Промени..."
diff --git a/tde-i18n-ms/messages/tdepim/libkpgp.po b/tde-i18n-ms/messages/tdepim/libkpgp.po
index c3b1cf218d9..136c751558e 100644
--- a/tde-i18n-ms/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ms/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mimos\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-10-12 09:20+0800\n"
 "Last-Translator: MIMOS <opensource@mimos.my>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -13,6 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Kehabisan memori."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,16 +54,16 @@ msgstr ""
 "Anda baru sahaja memasukkan frasa laluan yang tidak sah.\n"
 "Anda ingin cuba lagi, atau batalkan dan paparkan mesej tanpa dinyahsulitkan ?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Amaran PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Cuba lagi"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,39 +73,40 @@ msgstr ""
 "Anda ingin cuba lagi, teruskan dan biarkan mesej tanpa ditandatangani, atau "
 "batalkan penghantaran mesej?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Hantar Tanpa &Tandatangan"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Anda ingin hantar mesej tanpa ditandatangani, atau batalkan penghantaran mesej?"
+"Anda ingin hantar mesej tanpa ditandatangani, atau batalkan penghantaran "
+"mesej?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Teruskan penyulitan, biarkan mesej seperti adanya, atau batalkan penghantaran "
-"mesej?"
+"Teruskan penyulitan, biarkan mesej seperti adanya, atau batalkan "
+"penghantaran mesej?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Hantar &Sulitkan"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Hantar Tanpa &Disulitkan"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -102,11 +115,11 @@ msgstr ""
 "%1\n"
 "Anda ingin membiarkan mesej seperti adanya, atau batalkan penghantaran mesej?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Hantar seperti adanya"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -115,7 +128,7 @@ msgstr ""
 "Ralat berikut telah berlaku:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -123,23 +136,23 @@ msgstr ""
 "Ini adalah mesej ralat %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Anda tidak memilih kekunci penyulitan untuk penerima mesej ini; jadi, mesej ini "
-"tidak akan disulitkan."
+"Anda tidak memilih kekunci penyulitan untuk penerima mesej ini; jadi, mesej "
+"ini tidak akan disulitkan."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Anda tidak memilih kekunci penyulitan untuk mana-mana penerima mesej; jadi, "
 "mesej tidak akan disulitkan."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -147,15 +160,16 @@ msgstr ""
 "Anda tidak memilih kekunci penyulitan untuk salah seorang penerima; penerima "
 "ini tidak akan dapat menyahsulit mesej jika anda sulitkan mesej tersebut."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Anda tidak memilih kekunci penyulitan untuk beberapa orang penerima; penerima "
-"ini tidak akan dapat menyahsulitkan mesej jika anda sulitkan mesej tersebut. "
+"Anda tidak memilih kekunci penyulitan untuk beberapa orang penerima; "
+"penerima ini tidak akan dapat menyahsulitkan mesej jika anda sulitkan mesej "
+"tersebut. "
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -163,17 +177,17 @@ msgstr ""
 "Cirian ini\n"
 "masih hilang"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "GnuPG/PGP tidak dipasang atau anda memilih untuk tidak menggunakan GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Pilihan Kekunci Penyulitan"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -185,7 +199,7 @@ msgstr ""
 "\n"
 "Pilih semula  kekunci  yang sepatutnya digunakan untuk penerima ini."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -197,7 +211,7 @@ msgstr ""
 "\n"
 "Pilih kekunci yang sepatutnya digunakan untuk penerima ini.."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -257,8 +271,8 @@ msgstr "Frasa laluan rosak; tidak dapat tandatangan"
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Tandatangan gagal: semak identiti pengguna PGP anda, binaan PGP dan cincin "
 "kekunci."
@@ -303,8 +317,8 @@ msgstr "Frasa laluan yang anda masukkan tidak sah."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Kekunci yang anda ingin sulitkan mesej tidak dipercayai. Tiada penyulitan "
 "dilakukan"
@@ -356,7 +370,7 @@ msgstr "Tandatangan gagal kerana kekunci rahsia anda tidak boleh digunakan."
 msgid "Error running gpg"
 msgstr "Ralat semasa menjalankan gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (fail ~/.gnupg/pubring.gpg tidak ditemui)"
 
@@ -372,14 +386,19 @@ msgstr ""
 "Masukkan frasa laluan OpenPGP untuk\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Amaran PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Semak sama ada penyulitan betul-betul berfungsi sebelum mula menggunakannya "
-"secara serius. Ambil perhatian juga bahawa  lampiran tersebut tidak disulitkan "
-"menggunakan modul PGP/GPG."
+"secara serius. Ambil perhatian juga bahawa  lampiran tersebut tidak "
+"disulitkan menggunakan modul PGP/GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -413,34 +432,36 @@ msgstr "PGP Versi 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Jangan guna sebarang alat penyulitan"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Kekalkan frasa laluan dalam memori"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Jika opsyen ini diaktifkan, frasa laluan kekunci persendirian anda akan "
-"diingati oleh aplikasi  selagi aplikasi tersebut berjalan. Jadi, anda hanya "
-"perlu memasukkan frasa laluan sekali sahaja.</p>"
-"<p>Ambil perhatian bahawa ini mungkin suatu risiko keselamatan. Jika anda "
-"meninggalkan komputer, pihak lain boleh menggunakannya untuk menghantar mesej "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Jika opsyen ini diaktifkan, frasa laluan kekunci persendirian anda "
+"akan diingati oleh aplikasi  selagi aplikasi tersebut berjalan. Jadi, anda "
+"hanya perlu memasukkan frasa laluan sekali sahaja.</p><p>Ambil perhatian "
+"bahawa ini mungkin suatu risiko keselamatan. Jika anda meninggalkan "
+"komputer, pihak lain boleh menggunakannya untuk menghantar mesej "
 "bertandatangan dan/atau membaca mesej sulit anda. Jika pengabaian teras "
-"berlaku, kandungan RAM akan disimpan ke cakera, termasuk frasa laluan anda.</p>"
-"<p>Ambil perhatian bahawa apabila menggunakan KMail, seting ini hanya boleh "
-"digunakan jika anda tidak menggunakan ejen gpg. Ia juga tidak akan dilayan jika "
-"anda menggunakan plugin kripto.</p></qt>"
+"berlaku, kandungan RAM akan disimpan ke cakera, termasuk frasa laluan anda.</"
+"p><p>Ambil perhatian bahawa apabila menggunakan KMail, seting ini hanya "
+"boleh digunakan jika anda tidak menggunakan ejen gpg. Ia juga tidak akan "
+"dilayan jika anda menggunakan plugin kripto.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -448,17 +469,15 @@ msgstr "Sentiasa &sulitkan untuk diri sendiri"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jika opsyen ini diaktifkan, mesej/fail bukan sahaja akan disulitkan dengan "
-"kekunci umum penerima, tetapi juga dengan kekunci anda. Ini membolehkan anda "
-"menyahsulitkan mesej/fail kemudian. Umumnya, ini adalah idea yang bagus.</p>"
-"</qt>"
+"<qt><p>Jika opsyen ini diaktifkan, mesej/fail bukan sahaja akan disulitkan "
+"dengan kekunci umum penerima, tetapi juga dengan kekunci anda. Ini "
+"membolehkan anda menyahsulitkan mesej/fail kemudian. Umumnya, ini adalah "
+"idea yang bagus.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -466,17 +485,15 @@ msgstr "&Paparkan teks ditandatangan/disulitkan selepas menggubah"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jika opsyen ini diaktifkan, teks yang ditandatangan/disulitkan akan "
-"dipaparkan dalam tetingkap berasingan, membolehkan anda melihat rupanya sebelum "
-"dihantar. Ini idea yang bagus untuk mengesahkan sama ada sistem penyulitan anda "
-"berfungsi atau tidak.</p></qt>"
+"<qt><p>Jika opsyen ini diaktifkan, teks yang ditandatangan/disulitkan akan "
+"dipaparkan dalam tetingkap berasingan, membolehkan anda melihat rupanya "
+"sebelum dihantar. Ini idea yang bagus untuk mengesahkan sama ada sistem "
+"penyulitan anda berfungsi atau tidak.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -484,18 +501,17 @@ msgstr "Sentiasa paparkan kekunci penyulitan &untuk kelulusan"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Jika opsyen ini diaktifkan, aplikasi akan sentiasa memaparkan senarai "
-"kekunci umum untuk anda pilih mana satu yang akan digunakan untuk penyulitan. "
-"Jika ditutup, aplikasi hanya memaparkan dialog tersebut jika ia tidak dapat "
-"mencari kekunci yang betul atau jika ada sebilangan yang boleh digunakan. </p>"
-"</qt>"
+"<qt><p>Jika opsyen ini diaktifkan, aplikasi akan sentiasa memaparkan senarai "
+"kekunci umum untuk anda pilih mana satu yang akan digunakan untuk "
+"penyulitan. Jika ditutup, aplikasi hanya memaparkan dialog tersebut jika ia "
+"tidak dapat mencari kekunci yang betul atau jika ada sebilangan yang boleh "
+"digunakan. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -515,13 +531,11 @@ msgstr "Ingat pilihan"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jika kotak ini disemak, pilihan anda akan disimpan dan anda tidak akan "
-"ditanya lagi.</p></qt>"
+"<qt><p>Jika kotak ini disemak, pilihan anda akan disimpan dan anda tidak "
+"akan ditanya lagi.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -620,6 +634,10 @@ msgstr "Pilihan Kekunci OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Pilih satu kekunci OpenPGP untuk digunakan"
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Ubah..."
diff --git a/tde-i18n-nb/messages/tdepim/libkpgp.po b/tde-i18n-nb/messages/tdepim/libkpgp.po
index dde70d75028..d77cfd6c28a 100644
--- a/tde-i18n-nb/messages/tdepim/libkpgp.po
+++ b/tde-i18n-nb/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-06-20 10:38+0200\n"
 "Last-Translator: Øyvind A. Holm <sunny@sunbase.org>\n"
 "Language-Team: Norsk bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,7 +47,7 @@ msgstr "Passordet er for langt. Det må inneholde færre enn 1024 tegn."
 msgid "Out of memory."
 msgstr "Minnet er fullt."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -43,30 +55,30 @@ msgstr ""
 "Du har skrevet inn et ugyldig passord.\n"
 "Prøv igjen eller avbryt for å lese meldinga mens den fortsatt er kryptert."
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP-advarsel"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Prøv igjen"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Du har skrevet inn et ugyldig passord.\n"
-"Vil du prøve igjen, fortsette uten å signere meldinga eller avbryte sendingen "
-"av meldingen?"
+"Vil du prøve igjen, fortsette uten å signere meldinga eller avbryte "
+"sendingen av meldingen?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Send &usignert"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -75,26 +87,26 @@ msgstr ""
 "%1\n"
 "Vil du sende meldinga usignert, eller vil du avbryte?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Vil du kryptere uansett, la meldinga være som den er eller avbryte sendingen av "
-"meldingen?"
+"Vil du kryptere uansett, la meldinga være som den er eller avbryte sendingen "
+"av meldingen?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Send &kryptert"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Send &ukryptert"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -103,11 +115,11 @@ msgstr ""
 "%1\n"
 "Vil du la meldinga være som den er, eller vil du avbryte sendingen?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Send som den er"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -116,7 +128,7 @@ msgstr ""
 "Følgende feil oppstod:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -124,40 +136,41 @@ msgstr ""
 "Dette er feilmeldinga fra %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Du har ikke valgt en krypteringsnøkkel for mottakeren av denne meldinga. Derfor "
-"vil ikke denne meldinga bli kryptert."
+"Du har ikke valgt en krypteringsnøkkel for mottakeren av denne meldinga. "
+"Derfor vil ikke denne meldinga bli kryptert."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Du har ikke valgt en krypteringsnøkkel for samtlige mottakere av denne "
 "meldinga. Derfor vil ikke denne meldinga bli kryptert."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du har ikke valgt en krypteringsnøkkel for en av mottakerene av denne meldinga. "
-"Derfor vil ikke denne personen kunne dekryptere meldinga hvis du krypterer den."
+"Du har ikke valgt en krypteringsnøkkel for en av mottakerene av denne "
+"meldinga. Derfor vil ikke denne personen kunne dekryptere meldinga hvis du "
+"krypterer den."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "Du har ikke valgt en krypteringsnøkkel for noen av mottakerene av denne "
-"meldinga. Disse personene vil derfor ikke kunne dekryptere denne meldinga hvis "
-"du krypterer den."
+"meldinga. Disse personene vil derfor ikke kunne dekryptere denne meldinga "
+"hvis du krypterer den."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,18 +178,18 @@ msgstr ""
 "Denne funksjonen\n"
 "mangler fremdeles"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
-"Enten har du ikke GnuPG/PGP installert på systemet, eller du har valgt å ikke "
-"bruke GnuPG/PGP."
+"Enten har du ikke GnuPG/PGP installert på systemet, eller du har valgt å "
+"ikke bruke GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Valg av krypteringsnøkkel"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,7 +201,7 @@ msgstr ""
 "\n"
 "Velg på nytt hvilke nøkler som skal brukes for denne mottakeren."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -200,7 +213,7 @@ msgstr ""
 "\n"
 "Velg hvilke nøkler som skal brukes for denne mottakeren."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -258,8 +271,8 @@ msgstr "Feil passord. Kunne ikke signere."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Signering feilet. Sjekk PGP-brukeridentiteten din, PGP-oppsettet og "
 "nøkkelringene."
@@ -304,8 +317,8 @@ msgstr "Passordet du har angitt er ugyldig."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Nøklene du vil kryptere meldinga med er ikke betrodd. Ingen kryptering blir "
 "utført."
@@ -357,7 +370,7 @@ msgstr "Signeringen feilet fordi din hemmelige nøkkel er ubrukelig."
 msgid "Error running gpg"
 msgstr "Feil under kjøring av gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (fila «~/.gnupg/pubring.gpg» ble ikke funnet)"
 
@@ -373,6 +386,11 @@ msgstr ""
 "Skriv inn OpenPGP-passordet for\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP-advarsel"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -413,33 +431,34 @@ msgstr "PGP-versjon 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Ikke bruk noe krypteringsverktøy"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Lagre passordet i minnet"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Hvis du velger dette alternativet, vil passordet til din private nøkkel bli "
-"husket av programmet så lenge det kjører. Dette gjør at du kun trenger å angi "
-"passordet en gang.</p>"
-"<p>Vær dog oppmerksom på at dette kan være en sikkerhetsrisiko. Hvis du lar "
-"andre få tilgang til maskinen din, kan disse sende signerte meldinger og lese "
-"krypterte meldinger. Hvis programmet dumper innholdet i minnet til disk, vil "
-"også passordet bli lagret.</p>"
-"<p>Hvis du bruker KMail gjelder disse innstillingene kun hvis du ikke bruker "
-"gpg-agenten. De blir også sett bort i fra hvis man bruker "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Hvis du velger dette alternativet, vil passordet til din private "
+"nøkkel bli husket av programmet så lenge det kjører. Dette gjør at du kun "
+"trenger å angi passordet en gang.</p><p>Vær dog oppmerksom på at dette kan "
+"være en sikkerhetsrisiko. Hvis du lar andre få tilgang til maskinen din, kan "
+"disse sende signerte meldinger og lese krypterte meldinger. Hvis programmet "
+"dumper innholdet i minnet til disk, vil også passordet bli lagret.</"
+"p><p>Hvis du bruker KMail gjelder disse innstillingene kun hvis du ikke "
+"bruker gpg-agenten. De blir også sett bort i fra hvis man bruker "
 "krypteringsprogramtillegg.</p></qt>"
 
 #: kpgpui.cpp:174
@@ -448,17 +467,15 @@ msgstr "&Krypter alltid også til avsender"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Med dette alternativet skrudd på, vil meldinga både bli kryptert med "
-"mottakers offentlige nøkkel og din private nøkkel. Dette gir deg muligheten til "
-"å dekryptere meldinga på et senere tidspunkt. Dette er ofte en smart ting å "
-"gjøre.</p></qt>"
+"<qt><p>Med dette alternativet skrudd på, vil meldinga både bli kryptert med "
+"mottakers offentlige nøkkel og din private nøkkel. Dette gir deg muligheten "
+"til å dekryptere meldinga på et senere tidspunkt. Dette er ofte en smart "
+"ting å gjøre.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -466,16 +483,14 @@ msgstr "&Vis signert/kryptert tekst etter at e-posten er skrevet"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Hvis dette alternativet er skrudd på, vil signert/kryptert tekst bli vist i "
-"et eget vindu. Dette lar deg få se hvordan det vil bli seendes ut før du sender "
-"e-posten. Dette er smart å gjøre hvis du vil kontrollere at "
+"<qt><p>Hvis dette alternativet er skrudd på, vil signert/kryptert tekst bli "
+"vist i et eget vindu. Dette lar deg få se hvordan det vil bli seendes ut før "
+"du sender e-posten. Dette er smart å gjøre hvis du vil kontrollere at "
 "krypteringsfunksjonen din fungerer.</p></qt>"
 
 #: kpgpui.cpp:200
@@ -484,18 +499,17 @@ msgstr "Vis alltid krypteringsnøklene for &godkjenning"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Hvis dette alternativet er skrudd på, vil programmet alltid vise en liste "
-"over offentlige nøkler som du kan velge en nøkkel du vil bruke til kryptering "
-"fra. Hvis dette alternativet er slått av, vil programmet kun vise denne lista "
-"hvis det ikke finner den riktige nøkkelen, eller det er flere mulige som kan "
-"brukes.</p></qt>"
+"<qt><p>Hvis dette alternativet er skrudd på, vil programmet alltid vise en "
+"liste over offentlige nøkler som du kan velge en nøkkel du vil bruke til "
+"kryptering fra. Hvis dette alternativet er slått av, vil programmet kun vise "
+"denne lista hvis det ikke finner den riktige nøkkelen, eller det er flere "
+"mulige som kan brukes.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -515,13 +529,11 @@ msgstr "Husk valg"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Når denne boksen er avkrysset vil valgene du har gjort bli lagret, og du vil "
-"ikke bli spurt igjen.</p></qt>"
+"<qt><p>Når denne boksen er avkrysset vil valgene du har gjort bli lagret, og "
+"du vil ikke bli spurt igjen.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -620,6 +632,10 @@ msgstr "Valg av OpenPGP-nøkkel"
 msgid "Please select an OpenPGP key to use."
 msgstr "Velg en OpenPGP-nøkkel som skal brukes."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Forandre …"
diff --git a/tde-i18n-nds/messages/tdepim/libkpgp.po b/tde-i18n-nds/messages/tdepim/libkpgp.po
index 0cfa8e044b5..31e909a8db9 100644
--- a/tde-i18n-nds/messages/tdepim/libkpgp.po
+++ b/tde-i18n-nds/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2006-05-21 02:24+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr "Slötelsatz is to lang, he mutt nich mehr as 1024 Tekens bargen."
 msgid "Out of memory."
 msgstr "Keen Spieker verföögbor."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,16 +54,16 @@ msgstr ""
 "Du hest jüst en legen Slötelsatz ingeven.\n"
 "Wullt Du dat nochmaal versöken, oder de Naricht ahn Opslöteln ankieken?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP-Wohrschoen"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "Nochmaal ve&rsöken"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,11 +73,11 @@ msgstr ""
 "Wullt Du dat nochmaal versöken, wiedermaken (de Naricht nich ünnerschrieven) "
 "oder dat Sennen afbreken?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "&Ahn Ünnerschrift sennen"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -73,26 +85,26 @@ msgid ""
 msgstr ""
 "%1 Wullt Du de Naricht ahn Ünnerschrift sennen oder dat Sennen afbreken?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Wullt Du de Naricht liekers verslöteln, ehr so laten as se is, oder dat Sennen "
-"afbreken?"
+"Wullt Du de Naricht liekers verslöteln, ehr so laten as se is, oder dat "
+"Sennen afbreken?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "&Verslötelt sennen"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "&Ahn Verslöteln sennen"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -101,11 +113,11 @@ msgstr ""
 "%1\n"
 "Wullt Du de Naricht laten as se is, oder dat Sennen afbreken?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Ahn Ännern &sennen"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -114,7 +126,7 @@ msgstr ""
 "Dat geev den nakamen Fehler:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -122,7 +134,7 @@ msgstr ""
 "Dit is de Fehlermellen vun %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -130,15 +142,15 @@ msgstr ""
 "Du hest för den Adressaat vun disse Naricht keen Verslötelslötel utsöcht, "
 "dorför warrt de Naricht nich verslötelt."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Du hest för keeneen vun de Adressaten vun disse Naricht en Verslötelslötel "
 "utsöcht, dorför warrt de Naricht nich verslötelt."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -146,15 +158,15 @@ msgstr ""
 "Du hest för een vun de Adressaten keen Verslötelslötel utsöcht, he kann de "
 "Naricht nich lesen, wenn Du ehr verslötelst."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du hest för een Reeg vun de Adressaten keen Verslötelslötel utsöcht, se köönt "
-"de Naricht nich lesen, wenn Du ehr verslötelst."
+"Du hest för een Reeg vun de Adressaten keen Verslötelslötel utsöcht, se "
+"köönt de Naricht nich lesen, wenn Du ehr verslötelst."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -162,16 +174,16 @@ msgstr ""
 "Disse Funkschoon\n"
 "fehlt jümmers noch."
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "Du hest GnuPG/PGP nich installeert oder wullt dat nich bruken."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Slötel för't Verslöteln utsöken"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -183,7 +195,7 @@ msgstr ""
 "\n"
 "Bitte söök de Slötels för dissen Adressaat nochmaal ut."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -195,7 +207,7 @@ msgstr ""
 "\n"
 "Bitte söök de Slötels för dissen Adressaat ut."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -233,8 +245,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"De apen Slötels för de nakamen Bruker-ID(s) hebbt keen Ünnerschrift, de troot "
-"warrt.\n"
+"De apen Slötels för de nakamen Bruker-ID(s) hebbt keen Ünnerschrift, de "
+"troot warrt.\n"
 "%1\n"
 "De Naricht is nich verslötelt."
 
@@ -244,8 +256,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"De apen Slötels för de nakamen Bruker-ID(s) hebbt keen Ünnerschrift, de troot "
-"warrt.\n"
+"De apen Slötels för de nakamen Bruker-ID(s) hebbt keen Ünnerschrift, de "
+"troot warrt.\n"
 "%1\n"
 "Disse Personen köönt de Naricht nich lesen."
 
@@ -255,11 +267,11 @@ msgstr "Leeg Slötelsatz, Ünnerschrieven nich mööglich"
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Ünnerschrieven fehlslaan. Prööv bitte Dien PGP-Brukeridentiteet, de "
-"PGP-Installatschoon un de Slötelbunnen."
+"Ünnerschrieven fehlslaan. Prööv bitte Dien PGP-Brukeridentiteet, de PGP-"
+"Installatschoon un de Slötelbunnen."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -276,7 +288,8 @@ msgstr "Leeg Slötelsatz, Opslöteln nich mööglich"
 #: kpgpbase2.cpp:310 kpgpbase5.cpp:238 kpgpbaseG.cpp:278
 msgid "You do not have the secret key needed to decrypt this message."
 msgstr ""
-"Du hest den Privaatslötel nich, de för't Opslöteln vun disse Naricht nödig is."
+"Du hest den Privaatslötel nich, de för't Opslöteln vun disse Naricht nödig "
+"is."
 
 #: kpgpbase2.cpp:450
 msgid ""
@@ -300,11 +313,11 @@ msgstr "De Slötelsatz, den Du ingevne hest, is leeg."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"De Slötels, mit de Du de Naricht verslöteln wullt, warrt nich troot. Nix wöör "
-"verslötelt."
+"De Slötels, mit de Du de Naricht verslöteln wullt, warrt nich troot. Nix "
+"wöör verslötelt."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -354,7 +367,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "Fehler bi't Utföhren vun gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (Datei ~/.gnupg/pubring.gpg nich funnen)"
 
@@ -370,14 +383,19 @@ msgstr ""
 "Bitte den OpenPGP-Slötelsatz ingeven för\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP-Wohrschoen"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Prööv bitte, wat dat Verslöteln redig arbeidt, ehr Du dor eernsthaftige Arbeit "
-"mit maakst. Beacht bitte ok, dat Bilagen vun dat PGP/GPG-Moduul nich verslötelt "
-"warrt."
+"Prööv bitte, wat dat Verslöteln redig arbeidt, ehr Du dor eernsthaftige "
+"Arbeit mit maakst. Beacht bitte ok, dat Bilagen vun dat PGP/GPG-Moduul nich "
+"verslötelt warrt."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -411,32 +429,34 @@ msgstr "PGP Verschoon 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Keen Verslötelprogramm söken"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Slötelsatz in Spie&ker wohren"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Wenn aktiveert, wohrt dat Programm den Slötelsatz vun Dien Privaatslötel so "
-"lang as dat löppt. Du muttst em also bloots eenmaal ingeven.</p>"
-"<p>Wees Di dor över kloor, dat dit en Riskanz för de Sekerheit wesen kunn: Wenn "
-"Du den Reekner stahn lettst, köönt anner Lüüd ünnerschreven Nettbreven sennen "
-"oder Dien verslötelt Post lesen. Wenn en Programm afstört, warrt de "
-"Spiekerinholt op de Fastplaat sekert, dor is ok Dien Slötelsatz twischen.</p>"
-"<p>För KMail gellt disse Instellen bloots, wenn Du \"gpg-agent\" nich un ok "
-"keen Verslötel-Modulen bruukst.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Wenn aktiveert, wohrt dat Programm den Slötelsatz vun Dien "
+"Privaatslötel so lang as dat löppt. Du muttst em also bloots eenmaal ingeven."
+"</p><p>Wees Di dor över kloor, dat dit en Riskanz för de Sekerheit wesen "
+"kunn: Wenn Du den Reekner stahn lettst, köönt anner Lüüd ünnerschreven "
+"Nettbreven sennen oder Dien verslötelt Post lesen. Wenn en Programm afstört, "
+"warrt de Spiekerinholt op de Fastplaat sekert, dor is ok Dien Slötelsatz "
+"twischen.</p><p>För KMail gellt disse Instellen bloots, wenn Du \"gpg-agent"
+"\" nich un ok keen Verslötel-Modulen bruukst.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -444,17 +464,15 @@ msgstr "&Jümmers för mi sülven verslöteln"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wenn aktiveert, warrt de Naricht/Datei nich bloots mit den apen Slötel vun "
-"den Adressaat, man ok mit Dien egen apen Slötel verslötelt. Bloots so kannst Du "
-"de Naricht ok later noch opslöteln un denn lesen. Normalerwies warrt disse "
-"Optschoon anmaakt.</p></qt>"
+"<qt><p>Wenn aktiveert, warrt de Naricht/Datei nich bloots mit den apen "
+"Slötel vun den Adressaat, man ok mit Dien egen apen Slötel verslötelt. "
+"Bloots so kannst Du de Naricht ok later noch opslöteln un denn lesen. "
+"Normalerwies warrt disse Optschoon anmaakt.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -462,17 +480,15 @@ msgstr "Ünner&schreven/verslötelt Text na't Opstellen wiesen"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wenn aktiveert, warrt de ünnerschreven/verslötelt Text in en nieg Finster "
-"wiest, so dat Du di ankieken kannst, wodennig he utsüht, ehr Du em sennst. Dat "
-"is goot, wenn Du pröven wullt, wat Dien Verslötel-Systeem richtig arbeidt.</p>"
-"</qt>"
+"<qt><p>Wenn aktiveert, warrt de ünnerschreven/verslötelt Text in en nieg "
+"Finster wiest, so dat Du di ankieken kannst, wodennig he utsüht, ehr Du em "
+"sennst. Dat is goot, wenn Du pröven wullt, wat Dien Verslötel-Systeem "
+"richtig arbeidt.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -480,18 +496,17 @@ msgstr "Verslötelslötels jümmers för't &Beglöven wiesen"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Wenn aktiveert, warrt Di dat Programm jümmers en List vun apen Slötels "
-"wiesen, ut de Du den utsöken kannst, de denn för't Verslöteln bruukt warrt. Is "
-"dat nich aktiveert, kriggst Du de Utwahl bloots denn to sehn, wenn dat Programm "
-"den richtigen Slötel nich finnen kann oder wenn dat mehr as een Slötel gifft, "
-"de bruukt warrn kunn.</p></qt>"
+"<qt><p>Wenn aktiveert, warrt Di dat Programm jümmers en List vun apen "
+"Slötels wiesen, ut de Du den utsöken kannst, de denn för't Verslöteln bruukt "
+"warrt. Is dat nich aktiveert, kriggst Du de Utwahl bloots denn to sehn, wenn "
+"dat Programm den richtigen Slötel nich finnen kann oder wenn dat mehr as een "
+"Slötel gifft, de bruukt warrn kunn.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -511,13 +526,11 @@ msgstr "Utwahl wohren"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Wenn Du dit ankrüüzt, warrt Dien Utwahl wohrt un Du warrst nich nochmaal "
-"fraagt.</p></qt>"
+"<qt><p>Wenn Du dit ankrüüzt, warrt Dien Utwahl wohrt un Du warrst nich "
+"nochmaal fraagt.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -616,6 +629,10 @@ msgstr "OpenPGP-Slötel utsöken"
 msgid "Please select an OpenPGP key to use."
 msgstr "Söök bitte en OpenPGP-Slötel ut"
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Ännern..."
diff --git a/tde-i18n-nl/messages/tdepim/libkpgp.po b/tde-i18n-nl/messages/tdepim/libkpgp.po
index b9511a279b2..e4c80a7e4cf 100644
--- a/tde-i18n-nl/messages/tdepim/libkpgp.po
+++ b/tde-i18n-nl/messages/tdepim/libkpgp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-03-26 23:06+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team:  <nl@li.org>\n"
@@ -18,6 +18,18 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -38,7 +50,7 @@ msgstr "Wachtwoord is te lang. Deze dient minder dan 1024 tekens te bevatten."
 msgid "Out of memory."
 msgstr "Onvoldoende geheugen."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -46,16 +58,16 @@ msgstr ""
 "U hebt zojuist een onjuist wachtwoord opgegeven.\n"
 "Wilt u het opnieuw proberen of het bericht niet-ontcijferd laten weergeven?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP-waarschuwing"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Nogmaals"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -65,39 +77,40 @@ msgstr ""
 "Wilt u het opnieuw proberen, doorgaan en het bericht zonder ondertekening "
 "verzenden, of het verzenden van het bericht annuleren?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "&Niet-ondertekend verzenden"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Wilt u het bericht zonder ondertekening verzenden, of het verzenden annuleren?"
+"Wilt u het bericht zonder ondertekening verzenden, of het verzenden "
+"annuleren?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Wilt u het bericht toch versleutelen, laten zoals het is of het verzenden "
 "annuleren?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Versleuteld ver&zenden"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Onversle&uteld verzenden"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -106,11 +119,11 @@ msgstr ""
 "%1\n"
 "Wilt u het bericht laten zoals ze is of het verzenden annuleren?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Zo &verzenden"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -119,7 +132,7 @@ msgstr ""
 "De volgende fout deed zich voor:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -127,7 +140,7 @@ msgstr ""
 "Dit is de foutmelding van %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -135,24 +148,24 @@ msgstr ""
 "U hebt geen sleutel voor versleuteling gekozen voor de ontvanger van dit "
 "bericht. Het bericht zal daardoor niet versleuteld worden."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers van "
-"dit bericht. Het bericht zal daardoor niet versleuteld worden."
+"U hebt geen sleutel voor versleuteling gekozen voor één van de ontvangers "
+"van dit bericht. Het bericht zal daardoor niet versleuteld worden."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 "U hebt geen cryptografische sleutel geselecteerd voor één van de "
-"geadresseerden. Deze persoon zal niet in staat zijn het bericht te ontcijferen "
-"als u het versleutelt."
+"geadresseerden. Deze persoon zal niet in staat zijn het bericht te "
+"ontcijferen als u het versleutelt."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -161,7 +174,7 @@ msgstr ""
 "Deze personen zullen niet in staat zijn het bericht te ontcijferen als u het "
 "versleutelt."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -169,18 +182,18 @@ msgstr ""
 "Deze functie\n"
 "ontbreekt vooralsnog"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "U hebt of geen GnuPG/PGP geïnstalleerd of ervoor gekozen geen GnuPG/PGP te "
 "gebruiken."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Selectie van cryptografische sleutel"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -190,9 +203,10 @@ msgid ""
 msgstr ""
 "Er is een probleem met de cryptografische sleutel(s) voor \"%1\".\n"
 "\n"
-"Selecteer de sleutel(s) opnieuw die voor deze ontvanger zullen worden gebruikt."
+"Selecteer de sleutel(s) opnieuw die voor deze ontvanger zullen worden "
+"gebruikt."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -204,7 +218,7 @@ msgstr ""
 "\n"
 "Selecteer de sleutel(s) die voor deze ontvanger gebruikt zullen worden."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -244,8 +258,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"De publieke sleutels zijn niet gecertificeerd met een vertrouwde ondertekening "
-"voor gebruikers-id('s)\n"
+"De publieke sleutels zijn niet gecertificeerd met een vertrouwde "
+"ondertekening voor gebruikers-id('s)\n"
 "%1.\n"
 "Het bericht is niet versleuteld."
 
@@ -255,8 +269,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"De publieke sleutels zijn niet gecertificeerd met een vertrouwde ondertekening "
-"voor gebruikers-id('s)\n"
+"De publieke sleutels zijn niet gecertificeerd met een vertrouwde "
+"ondertekening voor gebruikers-id('s)\n"
 "%1.\n"
 "Deze personen zullen niet in staat zijn het bericht te lezen."
 
@@ -266,11 +280,11 @@ msgstr "Onjuist wachtwoord (passphrase); het ondertekenen mislukte."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"De ondertekening is mislukt. Controleer alstublieft uw "
-"PGP-gebruikersidentiteit, de PGP-instellingen en de sleutelringen."
+"De ondertekening is mislukt. Controleer alstublieft uw PGP-"
+"gebruikersidentiteit, de PGP-instellingen en de sleutelringen."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -313,11 +327,11 @@ msgstr "Het wachtwoord (passphrase) dat u invoerde is ongeldig."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"De sleutel(s) waarmee u het bericht wilt versleutelen zijn niet vertrouwd. Het "
-"versleutelen is geannuleerd."
+"De sleutel(s) waarmee u het bericht wilt versleutelen zijn niet vertrouwd. "
+"Het versleutelen is geannuleerd."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -366,7 +380,7 @@ msgstr "Ondertekening mislukte doordat uw geheime sleutel onbruikbaar is."
 msgid "Error running gpg"
 msgstr "Fout bij uitvoeren van gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (bestand ~/.gnupg/pubring.gpg is niet gevonden)"
 
@@ -382,14 +396,19 @@ msgstr ""
 "Voer uw OpenPGP-wachtwoord (passphrase) in voor\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP-waarschuwing"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Controleer a.u.b. of de versleuteling werkelijk werkt voordat u het serieus "
-"begint te gebruiken. Houd er ook rekening mee dat bijlagen niet door de "
-"PGP/GPG-module worden versleuteld."
+"begint te gebruiken. Houd er ook rekening mee dat bijlagen niet door de PGP/"
+"GPG-module worden versleuteld."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -423,35 +442,37 @@ msgstr "PGP-versie 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Geen enkel versleutelingsgereedschap gebruiken"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Wachtwoord (passphrase) in geheugen be&waren"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Als deze optie is ingeschakeld zal het wachtwoord van uw private sleutel "
-"worden onthouden gedurende de tijd dat de toepassing is geopend. U hoeft het "
-"wachtwoord dus slechts eenmaal in te vullen.</p> "
-"<p>Bedenk dat dit een beveiligingsrisico kan zijn. Als u uw werkplek verlaat "
-"kunnen anderen het wachtwoord gebruiken om ondertekende berichten te verzenden "
-"en/of uw versleutelde berichten lezen. Als het programma vastloopt zal de "
-"gegenereerde core-dump (de inhoud van uw ram-geheugen opgeslagen in een bestand "
-"genaamd \"Core\") uw wachtwoord bevatten.</p> "
-"<p>Opmerking: als u KMail gebruikt zal deze instelling alleen van toepassing "
-"zijn als u geen gebruik maakt van gpg-agent. Deze instelling is ook niet van "
-"toepassing op cryptografische plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Als deze optie is ingeschakeld zal het wachtwoord van uw private "
+"sleutel worden onthouden gedurende de tijd dat de toepassing is geopend. U "
+"hoeft het wachtwoord dus slechts eenmaal in te vullen.</p> <p>Bedenk dat dit "
+"een beveiligingsrisico kan zijn. Als u uw werkplek verlaat kunnen anderen "
+"het wachtwoord gebruiken om ondertekende berichten te verzenden en/of uw "
+"versleutelde berichten lezen. Als het programma vastloopt zal de "
+"gegenereerde core-dump (de inhoud van uw ram-geheugen opgeslagen in een "
+"bestand genaamd \"Core\") uw wachtwoord bevatten.</p> <p>Opmerking: als u "
+"KMail gebruikt zal deze instelling alleen van toepassing zijn als u geen "
+"gebruik maakt van gpg-agent. Deze instelling is ook niet van toepassing op "
+"cryptografische plugins.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -459,17 +480,15 @@ msgstr "Altijd voor mezelf versleu&telen"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Als deze optie is ingeschakeld zal het bericht/bestand niet alleen worden "
-"versleuteld met de publieke sleutel van de ontvanger, maar ook met uw eigen "
-"sleutel. U kunt dan op een later tijdstip het bericht/bestand ontcijferen. Dit "
-"is over het algemeen een goed idee.</p></qt>"
+"<qt><p>Als deze optie is ingeschakeld zal het bericht/bestand niet alleen "
+"worden versleuteld met de publieke sleutel van de ontvanger, maar ook met uw "
+"eigen sleutel. U kunt dan op een later tijdstip het bericht/bestand "
+"ontcijferen. Dit is over het algemeen een goed idee.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -477,17 +496,15 @@ msgstr "Versleutelde/ondertekende tekst tonen na het op&stellen"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Als deze optie is ingeschakeld, dan zal de ondertekende/versleutelde tekst "
-"worden getoond in een apart venster. Zo kunt u het eerst bekijken voordat u het "
-"verzendt. Op deze wijze kunt u nagaan of het versleutelingssysteem "
-"daadwerkelijk functioneert.</p></qt>"
+"<qt><p>Als deze optie is ingeschakeld, dan zal de ondertekende/versleutelde "
+"tekst worden getoond in een apart venster. Zo kunt u het eerst bekijken "
+"voordat u het verzendt. Op deze wijze kunt u nagaan of het "
+"versleutelingssysteem daadwerkelijk functioneert.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -495,18 +512,17 @@ msgstr "Altijd de sleutels voor &goedkeuring tonen"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Als deze optie is ingeschakeld zal de toepassing altijd een lijst met "
+"<qt><p>Als deze optie is ingeschakeld zal de toepassing altijd een lijst met "
 "publieke sleutels tonen waaruit u de sleutel kunt kiezen om mee te "
-"versleutelen. Als deze optie is uitgeschakeld zal de toepassing de lijst alleen "
-"tonen als de juiste sleutel niet gevonden is, of als er meerdere sleutels "
-"gebruikt kunnen worden. </p></qt>"
+"versleutelen. Als deze optie is uitgeschakeld zal de toepassing de lijst "
+"alleen tonen als de juiste sleutel niet gevonden is, of als er meerdere "
+"sleutels gebruikt kunnen worden. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -526,13 +542,11 @@ msgstr "Keuze onthouden"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt> "
-"<p>Als u dit keuzevakje selecteert, dan wordt uw keuze opgeslagen en zult u "
-"niet meer gevraagd worden.</p></qt>"
+"<qt> <p>Als u dit keuzevakje selecteert, dan wordt uw keuze opgeslagen en "
+"zult u niet meer gevraagd worden.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -631,6 +645,10 @@ msgstr "Selectie van OpenPGP-sleutel"
 msgid "Please select an OpenPGP key to use."
 msgstr "Selecteer a.u.b. de te gebruiken OpenPGP-sleutel."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Wijzigen..."
diff --git a/tde-i18n-pa/messages/tdepim/libkpgp.po b/tde-i18n-pa/messages/tdepim/libkpgp.po
index 13e7c6f4d1b..d29e45ae2d2 100644
--- a/tde-i18n-pa/messages/tdepim/libkpgp.po
+++ b/tde-i18n-pa/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-04-20 17:57+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,67 +47,67 @@ msgstr "ਪ੍ਹੈਰਾ ਬਹੁਤ ਲੰਮਾ ਹੈ, ਇਸ ਵਿੱਚ
 msgid "Out of memory."
 msgstr "ਮੈਮੋਰੀ ਤੋਂ ਬਾਹਰ।"
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP ਚੇਤਾਵਨੀ"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "ਮੁਡ਼ ਕੋਸ਼ਿਸ(&R)"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "ਨਾ-ਦਸਤਖਤੀ ਭੇਜੋ(&U)"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "ਇੰਕਰਿਪਟ ਕੀਤਾ ਭੇਜੋ(&E)"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "ਬਿਨ-ਇਨਕਰਿਪਟ ਹੀ ਭੇਜੋ(&U)"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "ਜਿਵੇਂ ਹੈ ਤਿਵੇਂ ਹੀ ਭੇਜੋ(&S)"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -104,7 +116,7 @@ msgstr ""
 "ਹੇਠ ਦਿੱਤੀ ਗਲਤੀ ਆਈ ਹੈ:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -112,31 +124,31 @@ msgstr ""
 "%1 ਦਾ ਇਹ ਗਲਤੀ ਸੁਨੇਹਾ ਹੈ:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -144,16 +156,16 @@ msgstr ""
 "ਇਹ ਫੀਚਰ ਹਾਲ਼ੇ\n"
 "ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "ਇੰਕਰਿਪਟ ਕੁੰਜੀ ਚੋਣ"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -165,7 +177,7 @@ msgstr ""
 "\n"
 "ਮੁੜ ਜਾਂਚ ਕਰੋ ਕਿ ਇਸ ਸਨੇਹੀ ਲਈ ਕਿਹੜੀ ਕੁੰਜੀ ਵਰਤੀ ਜਾਵੇ।"
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -174,7 +186,7 @@ msgid ""
 "Select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -220,8 +232,8 @@ msgstr ""
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 
 #: kpgpbase2.cpp:213
@@ -260,8 +272,8 @@ msgstr ""
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 
 #: kpgpbase5.cpp:157
@@ -306,7 +318,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "gpg ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (ਫਾਇਲ ~/.gnupg/pubring.gpg ਨਹੀਂ ਲੱਭੀ)"
 
@@ -320,6 +332,11 @@ msgid ""
 "\"%1\":"
 msgstr ""
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP ਚੇਤਾਵਨੀ"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -358,22 +375,25 @@ msgstr "PGP ਵਰਜਨ 6.x"
 msgid "Do not use any encryption tool"
 msgstr "ਕੋਈ ਇੰਕਰਿਪਟ ਸੰਦ ਨਾ ਵਰਤੋਂ"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "ਪ੍ਹੈਰਾ ਮੈਮੋਰੀ 'ਚ ਰੱਖੋ(&K)"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:174
@@ -382,11 +402,10 @@ msgstr ""
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:188
@@ -395,11 +414,10 @@ msgstr ""
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:200
@@ -408,11 +426,11 @@ msgstr ""
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
 
 #: kpgpui.cpp:327
@@ -433,9 +451,8 @@ msgstr "ਚੋਣ ਯਾਦ ਰੱਖੋ"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:391
@@ -535,6 +552,10 @@ msgstr "OpenPGP ਕੁੰਜੀ ਚੋਣ"
 msgid "Please select an OpenPGP key to use."
 msgstr "ਵਰਤਣ ਲਈ ਇੱਕ OpenPGP ਕੁੰਜੀ ਚੁਣੋ ਜੀ।"
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "ਤਬਦੀਲ..."
diff --git a/tde-i18n-pl/messages/tdepim/libkpgp.po b/tde-i18n-pl/messages/tdepim/libkpgp.po
index 5ff0f06c094..bbeed474992 100644
--- a/tde-i18n-pl/messages/tdepim/libkpgp.po
+++ b/tde-i18n-pl/messages/tdepim/libkpgp.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2015-01-18 13:22+0100\n"
 "Last-Translator: mcbx\n"
 "Language-Team:  <pl@li.org>\n"
@@ -19,6 +19,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -39,7 +51,7 @@ msgstr "Hasło jest zbyt długie, hasło musi mieć mniej niż 1024 znaki."
 msgid "Out of memory."
 msgstr "Brak pamięci."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -47,16 +59,16 @@ msgstr ""
 "Podane zostało niewłaściwe hasło.\n"
 "Czy chcesz spróbować ponownie, czy anulować i oglądać wiadomość zaszyfrowaną?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Ostrzeżenie PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Spróbuj ponownie"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -66,11 +78,11 @@ msgstr ""
 "Czy chcesz spróbować ponownie, kontynuować bez podpisywania wiadomości, czy "
 "anulować wysyłanie wiadomości?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Wyślij &niepodpisane"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -79,26 +91,26 @@ msgstr ""
 "%1\n"
 "Czy chcesz wysłać wiadomość niepodpisaną, czy anulować wysyłanie wiadomości?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Czy chcesz mimo to zaszyfrować, pozostawić wiadomość bez zmian, czy anulować "
 "wysyłanie wiadomości?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Wyślij &zaszyfrowane"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Wyślij &niezaszyfrowane"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -107,11 +119,11 @@ msgstr ""
 "%1\n"
 "Czy chcesz zostawić wiadomość bez zmian, czy anulować wysyłanie wiadomości?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Wyślij &bez zmian"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -120,7 +132,7 @@ msgstr ""
 "Wystąpił następujący błąd:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -128,7 +140,7 @@ msgstr ""
 "To jest komunikat o błędzie dla %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -136,15 +148,15 @@ msgstr ""
 "Nie został wybrany klucz szyfrujący dla odbiorcy wiadomości. Z tego powodu "
 "wiadomość nie zostanie zaszyfrowana."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Nie został wybrany klucz szyfrujący dla żadnego odbiorcy wiadomości. Z tego "
 "powodu wiadomość nie zostanie zaszyfrowana."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -152,7 +164,7 @@ msgstr ""
 "Nie został wybrany klucz szyfrujący dla jednego z odbiorców wiadomości. Ta "
 "osoba nie będzie w stanie odszyfrować wiadomości, jeśli ją zaszyfrujesz."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -160,7 +172,7 @@ msgstr ""
 "Nie został wybrany klucz szyfrujący dla niektórych odbiorców wiadomości. Te "
 "osoby nie będą w stanie odszyfrować wiadomości, jeśli ją zaszyfrujesz."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -168,17 +180,18 @@ msgstr ""
 "Ta funkcja jest wciąż\n"
 "niezaimplementowana"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
-msgid "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
+msgid ""
+"You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Albo nie masz zainstalowanego GnuPG/PGP, albo zdecydowałeś się nie używać "
 "GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Wybór klucza szyfrującego"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -191,7 +204,7 @@ msgstr ""
 "Proszę ponownie wybrać klucz lub klucze, które mają być użyte dla tego "
 "odbiorcy."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -203,7 +216,7 @@ msgstr ""
 "\n"
 "Wybierz klucz lub klucze, które mają zostać użyte dla tego odbiorcy."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -265,15 +278,17 @@ msgstr "Niepoprawne hasło, nie można podpisać."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Podpisywanie się nie powiodło: proszę sprawdzić tożsamość użytkownika PGP, "
 "ustawienia PGP i zbiory kluczy."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
-msgstr "Szyfrowanie się nie powiodło: proszę sprawdzić ustawienia PGP i zbiory kluczy."
+msgstr ""
+"Szyfrowanie się nie powiodło: proszę sprawdzić ustawienia PGP i zbiory "
+"kluczy."
 
 #: kpgpbase2.cpp:259 kpgpbase6.cpp:62 kpgpbase6.cpp:360
 msgid "error running PGP"
@@ -309,8 +324,8 @@ msgstr "Podane hasło jest niewłaściwe."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Klucz lub klucze, którymi chcesz zaszyfrować wiadomość nie są zaufane. "
 "Szyfrowanie nie zostało wykonane."
@@ -364,7 +379,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "Błąd podczas uruchamiania gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (nie znaleziono pliku ~/.gnupg/pubring.gpg)"
 
@@ -380,14 +395,19 @@ msgstr ""
 "Proszę podać hasło OpenPGP dla\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Ostrzeżenie PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Proszę sprawdzić, czy szyfrowanie naprawdę działa, zanim zaczniesz go używać do "
-"poważnych zadań. Należy również zauważyć, że załączniki nie są szyfrowane przez "
-"moduł PGP/GPG."
+"Proszę sprawdzić, czy szyfrowanie naprawdę działa, zanim zaczniesz go używać "
+"do poważnych zadań. Należy również zauważyć, że załączniki nie są szyfrowane "
+"przez moduł PGP/GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -421,35 +441,36 @@ msgstr "PGP wersja 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Nie używaj żadnego narzędzia do szyfrowania"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Trzymaj hasło w pamięci"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Jeśli ta opcja jest włączona, hasło do Twojego klucza prywatnego będzie "
-"pamiętane przez czas działania programu. W ten sposób będzie trzeba je podać "
-"tylko raz.</p>"
-"<p>Należy zauważyć, że stanowi to zagrożenie bezpieczeństwa. Jeśli odejdziesz "
-"od komputera, inne osoby mogą go użyć do wysłania podpisanych wiadomości i/lub "
-"do odczytania Twoich zaszyfrowanych wiadomości. Jeśli zdarzy się awaria "
-"programu, zawartość pamięci zostanie zapisana na dysk, łącznie z Twoim "
-"hasłem.</p>"
-"<p>Proszę zwrócić uwagę, że jeśli używasz KMail, to ustawienie ma zastosowanie "
-"tylko jeśli nie używasz programu gpg-agent. Jest ono również ignorowane, jeśli "
-"używasz wtyczek kryptograficznych.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Jeśli ta opcja jest włączona, hasło do Twojego klucza prywatnego "
+"będzie pamiętane przez czas działania programu. W ten sposób będzie trzeba "
+"je podać tylko raz.</p><p>Należy zauważyć, że stanowi to zagrożenie "
+"bezpieczeństwa. Jeśli odejdziesz od komputera, inne osoby mogą go użyć do "
+"wysłania podpisanych wiadomości i/lub do odczytania Twoich zaszyfrowanych "
+"wiadomości. Jeśli zdarzy się awaria programu, zawartość pamięci zostanie "
+"zapisana na dysk, łącznie z Twoim hasłem.</p><p>Proszę zwrócić uwagę, że "
+"jeśli używasz KMail, to ustawienie ma zastosowanie tylko jeśli nie używasz "
+"programu gpg-agent. Jest ono również ignorowane, jeśli używasz wtyczek "
+"kryptograficznych.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -457,16 +478,15 @@ msgstr "Zawsze szyfruj do &siebie"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jeśli ta opcja jest włączona, wiadomość lub plik będą zawsze szyfrowane nie "
-"tylko kluczem publicznym odbiorcy, ale także Twoim. Pozwoli Ci to odszyfrować "
-"później tę wiadomość lub plik.Generalnie jest to dobry pomysł.</p></qt>"
+"<qt><p>Jeśli ta opcja jest włączona, wiadomość lub plik będą zawsze "
+"szyfrowane nie tylko kluczem publicznym odbiorcy, ale także Twoim. Pozwoli "
+"Ci to odszyfrować później tę wiadomość lub plik.Generalnie jest to dobry "
+"pomysł.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -474,17 +494,15 @@ msgstr "Pokazuj podpisany/zaszyfrowany tekst po &utworzeniu"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jeśli ta opcja jest zaznaczona, podpisany lub zaszyfrowany tekst będzie "
-"pokazywany w oddzielnym oknie, co pozwoli ci zobaczyć jak będzie wyglądał, "
-"zanim zostanie wysłany. Jest to dobre rozwiązanie, kiedy sprawdzasz, czy system "
-"szyfrowania działa.</p></qt>"
+"<qt><p>Jeśli ta opcja jest zaznaczona, podpisany lub zaszyfrowany tekst "
+"będzie pokazywany w oddzielnym oknie, co pozwoli ci zobaczyć jak będzie "
+"wyglądał, zanim zostanie wysłany. Jest to dobre rozwiązanie, kiedy "
+"sprawdzasz, czy system szyfrowania działa.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -492,18 +510,17 @@ msgstr "Zawsze pokazuj klucze szyfrowania do &zatwierdzenia"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Jeśli ta opcja jest włączona, program zawsze pokaże ci listę kluczy "
-"publicznych, z których będzie można wybrać te do użycia do szyfrowania. Jeśli "
-"ta opcja jest wyłączona, program pokaże listę tylko jeśli nie może znaleźć "
-"właściwego klucza lub jeśli jest więcej niż jeden klucz, który może zostać "
-"użyty.</p></qt>"
+"<qt><p>Jeśli ta opcja jest włączona, program zawsze pokaże ci listę kluczy "
+"publicznych, z których będzie można wybrać te do użycia do szyfrowania. "
+"Jeśli ta opcja jest wyłączona, program pokaże listę tylko jeśli nie może "
+"znaleźć właściwego klucza lub jeśli jest więcej niż jeden klucz, który może "
+"zostać użyty.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -523,13 +540,11 @@ msgstr "Pamiętaj wybór"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Jeśli zaznaczysz tę opcję, Twój wybór zostanie zapamiętany i nie zostaniesz "
-"zapytany ponownie.</p></qt>"
+"<qt><p>Jeśli zaznaczysz tę opcję, Twój wybór zostanie zapamiętany i nie "
+"zostaniesz zapytany ponownie.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -628,6 +643,10 @@ msgstr "Wybór klucza OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Proszę wybrać klucz OpenPGP, który ma zostać użyty."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Zmień..."
@@ -692,8 +711,8 @@ msgid ""
 "plural in the translation\n"
 "Select the key(s) which should be used to encrypt the message to yourself."
 msgstr ""
-"Proszę wybrać klucz lub klucze, które mają być użyte do szyfrowania wiadomości "
-"do siebie."
+"Proszę wybrać klucz lub klucze, które mają być użyte do szyfrowania "
+"wiadomości do siebie."
 
 #: kpgpui.cpp:1543
 #, c-format
@@ -703,8 +722,8 @@ msgid ""
 "Select the key(s) which should be used to encrypt the message for\n"
 "%1"
 msgstr ""
-"Proszę wybrać klucz lub klucze, które mają być użyte do szyfrowania wiadomości "
-"dla\n"
+"Proszę wybrać klucz lub klucze, które mają być użyte do szyfrowania "
+"wiadomości dla\n"
 "%1"
 
 #: kpgpui.cpp:1619
@@ -714,4 +733,3 @@ msgstr "Informacja OpenPGP"
 #: kpgpui.cpp:1626
 msgid "Result of the last encryption/sign operation:"
 msgstr "Wynik ostatniej operacji szyfrowania/podpisywania:"
-
diff --git a/tde-i18n-pt/messages/tdepim/libkpgp.po b/tde-i18n-pt/messages/tdepim/libkpgp.po
index 42290d75fd3..f0eeb9738b1 100644
--- a/tde-i18n-pt/messages/tdepim/libkpgp.po
+++ b/tde-i18n-pt/messages/tdepim/libkpgp.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdenetwork\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-01-20 11:15+0000\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -13,6 +13,18 @@ msgstr ""
 "X-POFile-IgnoreConsistency: Untrusted\n"
 "X-POFile-SpellExtra: passphrase es\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Falta de memória."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,30 +54,30 @@ msgstr ""
 "Indicou uma frase-senha inválida.\n"
 "Quer tentar de novo ou cancelar e ver a mensagem sem estar decifrada?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Aviso do PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Repetir"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Indicou uma frase-senha inválida.\n"
-"Deseja tentar de novo, continuar e deixar a mensagem não assinada ou cancelar o "
-"envio da mensagem?"
+"Deseja tentar de novo, continuar e deixar a mensagem não assinada ou "
+"cancelar o envio da mensagem?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Enviar &Sem Assinar"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -74,26 +86,26 @@ msgstr ""
 "%1\n"
 "Deseja enviar a mensagem não assinada ou cancelar o envio da mensagem?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Deseja cifrar à mesma, deixar a mensagem como está, ou cancelar o envio da "
 "mensagem?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "En&viar Cifrada"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Enviar &Sem Cifrar"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -102,11 +114,11 @@ msgstr ""
 "%1\n"
 "Deseja deixar a mensagem como está ou cancelar o envio da mensagem?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Enviar como E&stá"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -115,7 +127,7 @@ msgstr ""
 "Ocorreu o seguinte erro:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -123,7 +135,7 @@ msgstr ""
 "Esta é a mensagem de erro de %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -131,23 +143,23 @@ msgstr ""
 "O utilizador não seleccionou uma chave de cifra para o destinatário desta "
 "mensagem. Como tal, a mensagem não vai ser cifrada."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"O utilizador não seleccionou uma chave de cifra para nenhum dos destinatários "
-"desta mensagem. Como tal, a mensagem não vai ser cifrada."
+"O utilizador não seleccionou uma chave de cifra para nenhum dos "
+"destinatários desta mensagem. Como tal, a mensagem não vai ser cifrada."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Não seleccionou nenhuma chave de cifra para um dos destinatários. Esta pessoa "
-"não conseguirá decifrar a mensagem se o utilizador a cifrar."
+"Não seleccionou nenhuma chave de cifra para um dos destinatários. Esta "
+"pessoa não conseguirá decifrar a mensagem se o utilizador a cifrar."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -155,7 +167,7 @@ msgstr ""
 "Não seleccionou nenhuma chave de cifra para alguns dos destinatários. Estas "
 "pessoas não conseguirão decifrar a mensagem se o utilizador a cifrar."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -163,16 +175,16 @@ msgstr ""
 "Esta funcionalidade ainda\n"
 "não está disponível"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "Não tem o GnuPG/PGP instalado ou optou por não o usar."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Escolha da Chave de Encriptação"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -184,7 +196,7 @@ msgstr ""
 "\n"
 "Seleccione de novo as chaves que devem ser usadas para este destinatário."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -196,7 +208,7 @@ msgstr ""
 "\n"
 "Seleccione as chaves que devem ser usadas para este destinatário."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -234,8 +246,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"As chaves públicas não estão certificadas com uma assinatura de confiança para "
-"o(s) utilizador(es)\n"
+"As chaves públicas não estão certificadas com uma assinatura de confiança "
+"para o(s) utilizador(es)\n"
 "%1.\n"
 "A mensagem não será cifrada."
 
@@ -245,8 +257,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"As chaves públicas não estão certificadas com uma assinatura de confiança para "
-"o(s) utilizador(es)\n"
+"As chaves públicas não estão certificadas com uma assinatura de confiança "
+"para o(s) utilizador(es)\n"
 "%1.\n"
 "Estas pessoas não conseguirão decifrar a mensagem."
 
@@ -256,8 +268,8 @@ msgstr "A frase-senha é inválida; não foi possível assinar."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "A assinatura falhou: verifique a sua Identidade de Utilizador do PGP, a sua "
 "configuração do PGP e os seus chaveiros."
@@ -302,8 +314,8 @@ msgstr "A frase-senha que o utilizador indicou é inválida."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "A(s) chave(s) com a(s) qual(is) deseja cifrar a sua mensagem não é(são) de "
 "confiança. Esta não será cifrada."
@@ -355,7 +367,7 @@ msgstr "A assinatura falhou porque a sua chave privada é inútil."
 msgid "Error running gpg"
 msgstr "Erro ao correr o gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (o ficheiro ~/.gnupg/pubring.gpg não foi encontrado)"
 
@@ -371,6 +383,11 @@ msgstr ""
 "Indique a sua frase-senha do OpenPGP para\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Aviso do PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -411,34 +428,35 @@ msgstr "PGP Versão 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Não usar qualquer ferramenta de cifra"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Manter a senha na memória"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Quando esta opção está activa, a frase-passe da sua chave privada será "
-"recordada pela aplicação enquanto esta estiver em execução. Deste modo, você só "
-"terá de indicar a frase-passe uma vez.</p>"
-"<p>Lembre-se que isto poderá representar um risco de segurança. Se você deixar "
-"o seu computador, os outros poderão usá-los para enviar mensagens assinadas "
-"e/ou ler as suas mensagens cifradas. Se ocorrer um estoiro com geração de "
-"'core', o conteúdo da sua RAM será guardado em disco, incluindo a sua "
-"frase-passe.</p>"
-"<p>Lembre-se que, quando está a usar o KMail, esta opção só se aplica se você "
-"não estiver a usar o gpg-agent. Também será ignorada se você estiver a usar "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Quando esta opção está activa, a frase-passe da sua chave privada "
+"será recordada pela aplicação enquanto esta estiver em execução. Deste modo, "
+"você só terá de indicar a frase-passe uma vez.</p><p>Lembre-se que isto "
+"poderá representar um risco de segurança. Se você deixar o seu computador, "
+"os outros poderão usá-los para enviar mensagens assinadas e/ou ler as suas "
+"mensagens cifradas. Se ocorrer um estoiro com geração de 'core', o conteúdo "
+"da sua RAM será guardado em disco, incluindo a sua frase-passe.</p><p>Lembre-"
+"se que, quando está a usar o KMail, esta opção só se aplica se você não "
+"estiver a usar o gpg-agent. Também será ignorada se você estiver a usar "
 "'plugins' de cifra.</p></qt>"
 
 #: kpgpui.cpp:174
@@ -447,17 +465,15 @@ msgstr "Cifrar sempre para o &próprio"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quando esta opção é activada, o ficheiro/mensagem não só será cifrado com a "
-"chave pública do receptor, como também com a sua chave. Isto permitir-lhe-á "
-"decifrar a mensagem/ficheiro numa altura posterior. Isto é geralmente uma boa "
-"ideia.</p></qt>"
+"<qt><p>Quando esta opção é activada, o ficheiro/mensagem não só será cifrado "
+"com a chave pública do receptor, como também com a sua chave. Isto permitir-"
+"lhe-á decifrar a mensagem/ficheiro numa altura posterior. Isto é geralmente "
+"uma boa ideia.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -465,17 +481,15 @@ msgstr "&Mostrar o texto cifrado/assinado depois de escrito"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quando esta opção estiver assinalada, o texto cifrado/assinado será "
+"<qt><p>Quando esta opção estiver assinalada, o texto cifrado/assinado será "
 "apresentado numa janela em separado, o que lhe permitirá saber como é que "
-"ficará antes de ser enviado. Isto é uma boa ideia quando você está a verificar "
-"se o seu sistema de cifra funciona.</p></qt>"
+"ficará antes de ser enviado. Isto é uma boa ideia quando você está a "
+"verificar se o seu sistema de cifra funciona.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -483,17 +497,17 @@ msgstr "Mostrar sempre as chaves de ci&fra para aprovação"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Quando esta opção estiver activa, a aplicação enviará sempre uma lista das "
-"chaves públicas, na qual você poderá escolher a que será usada para a cifra. Se "
-"estiver desligada, a aplicação só irá mostrar a janela se não encontrar a chave "
-"adequada ou se tiver bastantes que possam ser usadas.</p></qt>"
+"<qt><p>Quando esta opção estiver activa, a aplicação enviará sempre uma "
+"lista das chaves públicas, na qual você poderá escolher a que será usada "
+"para a cifra. Se estiver desligada, a aplicação só irá mostrar a janela se "
+"não encontrar a chave adequada ou se tiver bastantes que possam ser usadas.</"
+"p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -513,13 +527,11 @@ msgstr "Recordar a decisão"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Se assinalar esta opção, a escolha do utilizador será armazenada e não lhe "
-"será perguntada de novo.</p></qt>"
+"<qt><p>Se assinalar esta opção, a escolha do utilizador será armazenada e "
+"não lhe será perguntada de novo.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -618,6 +630,10 @@ msgstr "Selecção da Chave do OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Por favor, seleccione uma chave de OpenPGP a usar."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Modificar..."
diff --git a/tde-i18n-pt_BR/messages/tdepim/libkpgp.po b/tde-i18n-pt_BR/messages/tdepim/libkpgp.po
index 51224b12bb4..f1ff5070d5c 100644
--- a/tde-i18n-pt_BR/messages/tdepim/libkpgp.po
+++ b/tde-i18n-pt_BR/messages/tdepim/libkpgp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-02-22 08:49-0300\n"
 "Last-Translator: Eduardo Pereira Habkost <ehabkost@gmx.net>\n"
 "Language-Team: Português do Brasil <pt@li.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -37,39 +49,39 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Sem memória."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 "Você forneceu uma frase-secreta inválida.\n"
-"Você deseja tentar novamente, ou cancelar e ver a mensagem "
-"não-descriptografada?"
+"Você deseja tentar novamente, ou cancelar e ver a mensagem não-"
+"descriptografada?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Aviso do PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "Tenta&r Novamente"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Você foneceu uma frase-secreta inválida.\n"
-"Você deseja tentar novamente, continuar (e enviar a mensagem sem assiná-la), ou "
-"cancelar o envio da mensagem?"
+"Você deseja tentar novamente, continuar (e enviar a mensagem sem assiná-la), "
+"ou cancelar o envio da mensagem?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Enviar &Sem Assinatura"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -78,26 +90,26 @@ msgstr ""
 "%1\n"
 "Você deseja enviar a mensagem sem assiná-la ou cancelar o envio dela?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Você deseja encriptar assim mesmo, deixar a mensagem como ela está, ou cancelar "
-"o envio dela?"
+"Você deseja encriptar assim mesmo, deixar a mensagem como ela está, ou "
+"cancelar o envio dela?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Enviar &Criptografada"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "&Enviar Sem Criptografá-la"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -106,11 +118,11 @@ msgstr ""
 "%1\n"
 "Você deseja deixar a mensagem como ela está, ou cancelar o envio?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "En&viar Como Está"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -119,7 +131,7 @@ msgstr ""
 "O seguinte erro ocorreu:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -127,7 +139,7 @@ msgstr ""
 "Essa é a mensagem de erro de %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -135,15 +147,15 @@ msgstr ""
 "Você não selecionou uma chave de criptografia para o destinatário dessa "
 "mensagem, portanto a mensagem não será criptografada."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Você não selecionou uma chave de criptografia para nenhum dos destinatários "
 "dessa mensagem, portanto ela não será criptografada."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -152,7 +164,7 @@ msgstr ""
 "mensagem; essa pessoa não poderá descriptografar a mensagem se você "
 "criptografá-la."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -161,7 +173,7 @@ msgstr ""
 "mensagem; essas pessoas não poderão descriptografar a mensagem se você "
 "criptografá-la."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -169,16 +181,16 @@ msgstr ""
 "Este recurso\n"
 "ainda não está pronto"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "Ou você não tem o GnuPG/PGP instalado, ou escolheu não usá-lo."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Seleção de Chave de Criptografia"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,10 +200,10 @@ msgid ""
 msgstr ""
 "Existe um problema com a(s) chave(s) de criptografia para \"%1\".\n"
 "\n"
-"Por favor, selecione novamente a(s) chave(s) que deve(m) ser usada(s) para esse "
-"destinatário."
+"Por favor, selecione novamente a(s) chave(s) que deve(m) ser usada(s) para "
+"esse destinatário."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -203,7 +215,7 @@ msgstr ""
 "\n"
 "Selecione a(s) chave(s) que deve(m) ser usada(s) para esse destinatário."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -265,11 +277,11 @@ msgstr "Frase-secreta ruim, não foi possível assinar."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Assinatura falhou: favor verificar sua Identidade de Usuário, sua configuração "
-"e os chaveiros PGP."
+"Assinatura falhou: favor verificar sua Identidade de Usuário, sua "
+"configuração e os chaveiros PGP."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -287,7 +299,8 @@ msgstr "Frase secreta ruim, não foi possível descriptografar."
 #: kpgpbase2.cpp:310 kpgpbase5.cpp:238 kpgpbaseG.cpp:278
 msgid "You do not have the secret key needed to decrypt this message."
 msgstr ""
-"Você não possui a chave secreta necessária para descriptografar esta mensagem."
+"Você não possui a chave secreta necessária para descriptografar esta "
+"mensagem."
 
 #: kpgpbase2.cpp:450
 msgid ""
@@ -311,8 +324,8 @@ msgstr "A frase-secreta que você forneceu é inválida."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "A(s) chave(s) para as quais você quer criptografar sua mensagem não são "
 "confiáveis. Criptografia não realizada."
@@ -364,7 +377,7 @@ msgstr "Assinatura falhou porque a sua chave secreta está inutilizável."
 msgid "Error running gpg"
 msgstr "Erro ao executar o gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (arquivo ~/.gnupg/pubring.gpg não encontrado)"
 
@@ -380,13 +393,19 @@ msgstr ""
 "Por favor, forneça a frase secreta OpenPGP para\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Aviso do PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Favor verificar se a criptografia realmente está funcionando antes de usá-la "
-"seriamente. Também note que anexos não são criptografados pelo módulo PGP/GPG."
+"seriamente. Também note que anexos não são criptografados pelo módulo PGP/"
+"GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -420,34 +439,36 @@ msgstr "PGP Versão 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Não usar uma ferramenta de criptografia"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Manter a frase-senha na memória"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Quando esta opção está ativada, a frase secreta de sua chave privada será "
-"lembrada pelo aplicativo enquanto ele estiver em execução. Assim, você "
-"precisará entrar com a frase secreta apenas uma vez</p>"
-"<p>Saiba que isso pode ser um risco de seguraça. Se você deixar o seu "
-"computador, outros podem usá-lo para enviar mensagens assinadas e/ou ler as "
-"suas mensagens criptografadas. Se um \"core dump\" ocorrer, o conteúdo da sua "
-"RAM será salvado no disco, incluindo a sua frase secreta.</p> "
-"<p>Perceba que quando estiver usando o KMail, esta configuração se aplica "
-"apenas se você não estiver usando o agente gpg (\"gpg-agent\"). Ela também é "
-"ignorada se você estiver utilizando plugins de criptografia.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt> <p>Quando esta opção está ativada, a frase secreta de sua chave privada "
+"será lembrada pelo aplicativo enquanto ele estiver em execução. Assim, você "
+"precisará entrar com a frase secreta apenas uma vez</p><p>Saiba que isso "
+"pode ser um risco de seguraça. Se você deixar o seu computador, outros podem "
+"usá-lo para enviar mensagens assinadas e/ou ler as suas mensagens "
+"criptografadas. Se um \"core dump\" ocorrer, o conteúdo da sua RAM será "
+"salvado no disco, incluindo a sua frase secreta.</p> <p>Perceba que quando "
+"estiver usando o KMail, esta configuração se aplica apenas se você não "
+"estiver usando o agente gpg (\"gpg-agent\"). Ela também é ignorada se você "
+"estiver utilizando plugins de criptografia.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -455,17 +476,15 @@ msgstr "Sempre c&riptografar para si mesmo"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quando esta opção estiver habilitada, as mensagens/arquivos não serão "
-"criptografados apenas com a chave pública do destinatário, mas também com a sua "
-"chave. Isso permitirá que você possa descriptografar a mensagem mais tarde. "
-"Isso geralmente é uma boa idéia.</p></qt>"
+"<qt><p>Quando esta opção estiver habilitada, as mensagens/arquivos não serão "
+"criptografados apenas com a chave pública do destinatário, mas também com a "
+"sua chave. Isso permitirá que você possa descriptografar a mensagem mais "
+"tarde. Isso geralmente é uma boa idéia.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -473,17 +492,15 @@ msgstr "Mo&strar texto assinado/criptografado após a composição"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Quando esta opção estiver habilitada, o texto assinado/criptografado será "
-"mostrado numa janela separada, permitindo que você o veja antes de ser enviado. "
-"Isso geralmente é uma boa idéia se você estiver verificando se o seu sistema de "
-"criptografia está funcionando.</p></qt>"
+"<qt><p>Quando esta opção estiver habilitada, o texto assinado/criptografado "
+"será mostrado numa janela separada, permitindo que você o veja antes de ser "
+"enviado. Isso geralmente é uma boa idéia se você estiver verificando se o "
+"seu sistema de criptografia está funcionando.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -491,18 +508,17 @@ msgstr "Sempre mostrar chaves de criptogra&fia para aprovação"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Quando esta opção estiver habilitada, o aplicativo vai sempre mostrar a você "
-"uma lista de chaves públicas, das quais você pode escolher qual você usará para "
-"criptografia. Se estiver desligada, o aplicativo vai mostrar apenas o diálogo "
-"se não conseguir encontrar a chave correta ou se houver várias que possam ser "
-"usadas.</p></qt>"
+"<qt><p>Quando esta opção estiver habilitada, o aplicativo vai sempre mostrar "
+"a você uma lista de chaves públicas, das quais você pode escolher qual você "
+"usará para criptografia. Se estiver desligada, o aplicativo vai mostrar "
+"apenas o diálogo se não conseguir encontrar a chave correta ou se houver "
+"várias que possam ser usadas.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -522,13 +538,11 @@ msgstr "Lembrar escolha"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Se você marcar esta caixa, sua escolha será armazenada e você não será "
-"perguntado novamente.</p></qt>"
+"<qt><p>Se você marcar esta caixa, sua escolha será armazenada e você não "
+"será perguntado novamente.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -627,6 +641,10 @@ msgstr "Seleção de Chave OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Por favor, selecione uma chave OpenPGP para usar."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Modificar..."
diff --git a/tde-i18n-ru/messages/tdepim/libkpgp.po b/tde-i18n-ru/messages/tdepim/libkpgp.po
index 6bac4ae6fe2..7a12800ccca 100644
--- a/tde-i18n-ru/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ru/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-01-20 15:00+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -14,8 +14,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
 
 #: kpgp.cpp:187
 msgid ""
@@ -37,7 +49,7 @@ msgstr "Пароль слишком длинный, он должен содер
 msgid "Out of memory."
 msgstr "Недостаточно памяти."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -45,29 +57,29 @@ msgstr ""
 "Вы ввели некорректный пароль.\n"
 "Хотите попытаться снова или отменить и посмотреть зашифрованное сообщение? "
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Предупреждение PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Повторить"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
-"Вы ввели некорректный пароль. Хотите попытаться снова, продолжить отправку не "
-"подписанного сообщения, или отменить отправку сообщения?"
+"Вы ввели некорректный пароль. Хотите попытаться снова, продолжить отправку "
+"не подписанного сообщения, или отменить отправку сообщения?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Отправить &не подписанным"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -77,26 +89,26 @@ msgstr ""
 "Вы действительно хотите отправить сообщение не подписанным, или отменить "
 "отправку сообщения?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Вы хотите всё равно зашифровать сообщение, оставить его как есть, или отменить "
-"отправку сообщения?"
+"Вы хотите всё равно зашифровать сообщение, оставить его как есть, или "
+"отменить отправку сообщения?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Отправить &зашифрованным"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Отправить &не зашифрованным"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -105,11 +117,11 @@ msgstr ""
 "%1\n"
 "Хотите отправить сообщение как есть или отменить его отправку?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Послать как есть"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -118,7 +130,7 @@ msgstr ""
 "Произошла следующая ошибка:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -126,39 +138,39 @@ msgstr ""
 "Сообщение об ошибке от %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Вы не выбрали ключ шифрования получателя этого сообщения, поэтому оно не будет "
-"зашифровано."
+"Вы не выбрали ключ шифрования получателя этого сообщения, поэтому оно не "
+"будет зашифровано."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Вы не выбрали ключ шифрования одного получателя этого сообщения, поэтому оно не "
-"будет зашифровано."
+"Вы не выбрали ключ шифрования одного получателя этого сообщения, поэтому оно "
+"не будет зашифровано."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Вы не выбрали ключ шифрования одного из получателей этого сообщения, поэтому он "
-"не сможет расшифровать его."
+"Вы не выбрали ключ шифрования одного из получателей этого сообщения, поэтому "
+"он не сможет расшифровать его."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Вы не выбрали ключи шифрования нескольких получателей этого сообщения, поэтому "
-"они не смогут расшифровать его."
+"Вы не выбрали ключи шифрования нескольких получателей этого сообщения, "
+"поэтому они не смогут расшифровать его."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -166,17 +178,17 @@ msgstr ""
 "Эта особенность \n"
 "всё ещё отсутствует"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "У вас не установлено GnuPG/PGP, либо вы не хотите использовать GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Выбор ключа шифрования"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -189,7 +201,7 @@ msgstr ""
 "Повторно назначьте ключ шифрования, который должен использоваться для этого "
 "получателя."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -201,7 +213,7 @@ msgstr ""
 "\n"
 "Выберите ключ шифрования, который должен использоваться для этого получателя."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -219,7 +231,8 @@ msgid ""
 "%1;\n"
 "the message is not encrypted."
 msgstr ""
-"Невозможно найти открытые ключи, соответствующие идентификаторам пользователя\n"
+"Невозможно найти открытые ключи, соответствующие идентификаторам "
+"пользователя\n"
 "%1;\n"
 "сообщение не не будет зашифровано."
 
@@ -229,7 +242,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"Невозможно найти открытые ключи, соответствующие идентификаторам пользователя\n"
+"Невозможно найти открытые ключи, соответствующие идентификаторам "
+"пользователя\n"
 "%1;\n"
 "эти люди не смогут прочитать сообщение."
 
@@ -259,11 +273,11 @@ msgstr "Некорректный пароль; подписать невозмо
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Подписание не удалось: проверьте вашу идентификацию PGP, настройку PGP и связки "
-"ключей."
+"Подписание не удалось: проверьте вашу идентификацию PGP, настройку PGP и "
+"связки ключей."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -304,8 +318,8 @@ msgstr "Введённый вами пароль корректен."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Включи, которыми вы хотите подписать сообщение не проверены. Шифрование "
 "выполняться не будет."
@@ -357,7 +371,7 @@ msgstr "Ошибка подписывания из-за неверного кл�
 msgid "Error running gpg"
 msgstr "Ошибка запуска gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (файл ~/.gnupg/pubring.gpg не найден)"
 
@@ -373,6 +387,11 @@ msgstr ""
 "Введите пароль OpenPGP для\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Предупреждение PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -413,34 +432,35 @@ msgstr "PGP версии 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Не использовать утилиты шифрования"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Хранить пароль в памяти"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt> "
-"<p>Если этот параметр установлен, пароль вашего частного ключа будет храниться "
-"в памяти пока приложение выполняется. Таким образом, вам придётся вводить "
-"пароль только один раз.</p> "
-"<p>Знайте, что это создаёт угрозу безопасности. Если вы оставляете ваш "
-"компьютер без присмотра, другие могут использовать его для отправки подписанных "
-"от вашего имени сообщений и/или читать ваши зашифрованные сообщения. Если "
-"произойдёт сбой приложения, его адресное пространство будет записано на диск, "
-"включая пароль</p> "
-"<p>Обратите внимание, что при использовании KMail этот параметр применяется "
-"только в случае, если не используется агент gpg. Он также игнорируется если вы "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt> <p>Если этот параметр установлен, пароль вашего частного ключа будет "
+"храниться в памяти пока приложение выполняется. Таким образом, вам придётся "
+"вводить пароль только один раз.</p> <p>Знайте, что это создаёт угрозу "
+"безопасности. Если вы оставляете ваш компьютер без присмотра, другие могут "
+"использовать его для отправки подписанных от вашего имени сообщений и/или "
+"читать ваши зашифрованные сообщения. Если произойдёт сбой приложения, его "
+"адресное пространство будет записано на диск, включая пароль</p> <p>Обратите "
+"внимание, что при использовании KMail этот параметр применяется только в "
+"случае, если не используется агент gpg. Он также игнорируется если вы "
 "используете дополнительные модули шифрования. </p> </qt>"
 
 #: kpgpui.cpp:174
@@ -449,16 +469,14 @@ msgstr "Всегда шифровать для &себя"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Если параметр включен, сообщение/файл будут зашифрованы не только открытым "
-"ключом получателя, а также и вашим ключом. Это позволит вам расшифровать "
-"сообщение/файл позже. Обычно это хорошая идея.</p></qt>"
+"<qt><p>Если параметр включен, сообщение/файл будут зашифрованы не только "
+"открытым ключом получателя, а также и вашим ключом. Это позволит вам "
+"расшифровать сообщение/файл позже. Обычно это хорошая идея.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -466,16 +484,14 @@ msgstr "&Показывать подписанный/зашифрованный
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Если параметр включен, подписанный/зашифрованный текст будет показан в "
-"отдельном окне, позволяя перед его отправкой посмотреть как он выглядит. Это "
-"хороший способ убедиться в том, что ваша система шифрования работает "
+"<qt><p>Если параметр включен, подписанный/зашифрованный текст будет показан "
+"в отдельном окне, позволяя перед его отправкой посмотреть как он выглядит. "
+"Это хороший способ убедиться в том, что ваша система шифрования работает "
 "нормально.</p></qt>"
 
 #: kpgpui.cpp:200
@@ -484,18 +500,18 @@ msgstr "Всегда показывать ключи шифрования для
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Когда параметр включен, приложение всегда будет показывать вам список "
+"<qt><p>Когда параметр включен, приложение всегда будет показывать вам список "
 "открытых ключей, из которого вы сможете выбрать один, который будет "
 "использоваться для шифрования. Если параметр выключен, приложение будет "
-"показывать диалог только в том случае, если не сможет найти необходимый ключ, "
-"или если найдено несколько ключей, которые могут быть использованы.</p></qt>"
+"показывать диалог только в том случае, если не сможет найти необходимый "
+"ключ, или если найдено несколько ключей, которые могут быть использованы.</"
+"p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -515,12 +531,10 @@ msgstr "Запомнить выбор"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Если вы включите этот параметр, ваш выбор будет сохранён, и не будет "
+"<qt><p>Если вы включите этот параметр, ваш выбор будет сохранён, и не будет "
 "запрашиваться каждый раз.</p></qt>"
 
 #: kpgpui.cpp:391
@@ -620,6 +634,10 @@ msgstr "Выбор ключа OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Выберите используемый ключ OpenPGP."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Изменить..."
diff --git a/tde-i18n-rw/messages/tdepim/libkpgp.po b/tde-i18n-rw/messages/tdepim/libkpgp.po
index 0a8808d7e85..f4a295aec11 100644
--- a/tde-i18n-rw/messages/tdepim/libkpgp.po
+++ b/tde-i18n-rw/messages/tdepim/libkpgp.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-05-25 18:52-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,6 +24,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 #, fuzzy
 msgid ""
@@ -48,7 +60,7 @@ msgstr "ni Birebire , Bike Inyuguti . "
 msgid "Out of memory."
 msgstr "Ububiko bwarenzwe"
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 #, fuzzy
 msgid ""
 "You just entered an invalid passphrase.\n"
@@ -57,17 +69,17 @@ msgstr ""
 "Bitemewe . \n"
 "Kuri Kugerageza Nanone , Cyangwa Kureka na Reba i &Ubutumwa ? "
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 #, fuzzy
 msgid "PGP Warning"
 msgstr "Iburira"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "Ongera ugerageze"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 #, fuzzy
 msgid ""
 "You entered an invalid passphrase.\n"
@@ -75,15 +87,15 @@ msgid ""
 "sending the message?"
 msgstr ""
 "Bitemewe . \n"
-"Kuri Kugerageza Nanone , Gukomeza na i &Ubutumwa Bitashizweho umukono , Cyangwa "
-"Kureka i &Ubutumwa ? "
+"Kuri Kugerageza Nanone , Gukomeza na i &Ubutumwa Bitashizweho umukono , "
+"Cyangwa Kureka i &Ubutumwa ? "
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 #, fuzzy
 msgid "Send &Unsigned"
 msgstr "Bitashizweho umukono"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 #, fuzzy
 msgid ""
 "_: %1 = 'signing failed' error message\n"
@@ -91,30 +103,32 @@ msgid ""
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1 \n"
-"Kuri Kohereza i &Ubutumwa Bitashizweho umukono , Cyangwa Kureka i &Ubutumwa ? "
+"Kuri Kohereza i &Ubutumwa Bitashizweho umukono , Cyangwa Kureka i "
+"&Ubutumwa ? "
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 #, fuzzy
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1 \n"
-"Kuri Shyiraho Umutekano , i &Ubutumwa Nka - ni , Cyangwa Kureka i &Ubutumwa ? "
+"Kuri Shyiraho Umutekano , i &Ubutumwa Nka - ni , Cyangwa Kureka i "
+"&Ubutumwa ? "
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 #, fuzzy
 msgid "Send &Encrypted"
 msgstr "Kohereza ibidasobetse"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 #, fuzzy
 msgid "Send &Unencrypted"
 msgstr "Kohereza ibidasobetse"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 #, fuzzy
 msgid ""
 "_: %1 = 'missing keys' error message\n"
@@ -124,12 +138,12 @@ msgstr ""
 "%1 \n"
 "Kuri i &Ubutumwa Nka - ni , Cyangwa Kureka i &Ubutumwa ? "
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 #, fuzzy
 msgid "&Send As-Is"
 msgstr "Kohereza amadosiye"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, fuzzy, c-format
 msgid ""
 "The following error occurred:\n"
@@ -138,7 +152,7 @@ msgstr ""
 "Ikosa : \n"
 "%1 "
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 #, fuzzy
 msgid ""
 "This is the error message of %1:\n"
@@ -147,7 +161,7 @@ msgstr ""
 "ni i Ikosa &Ubutumwa Bya %1 : \n"
 "%2 "
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 #, fuzzy
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
@@ -156,16 +170,16 @@ msgstr ""
 "OYA Guhitamo Bishunzwe: Urufunguzo ya:  i Uwandikiwe Bya iyi &Ubutumwa ; , i "
 "&Ubutumwa OYA Bishunzwe: . "
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 #, fuzzy
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"OYA Guhitamo Bishunzwe: Urufunguzo ya:  Icyo ari cyo cyose Bya i Abandikiwe... "
-"Bya iyi &Ubutumwa ; , i &Ubutumwa OYA Bishunzwe: . "
+"OYA Guhitamo Bishunzwe: Urufunguzo ya:  Icyo ari cyo cyose Bya i "
+"Abandikiwe... Bya iyi &Ubutumwa ; , i &Ubutumwa OYA Bishunzwe: . "
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 #, fuzzy
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
@@ -174,34 +188,34 @@ msgstr ""
 "OYA Guhitamo Bishunzwe: Urufunguzo ya:  Rimwe Bya i Abandikiwe... ; iyi OYA "
 "Kuri i &Ubutumwa NIBA Shyiraho Umutekano . "
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 #, fuzzy
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"OYA Guhitamo Bishunzwe: Utubuto ya:  Bya i Abandikiwe... ; OYA Kuri i &Ubutumwa "
-"NIBA Shyiraho Umutekano . "
+"OYA Guhitamo Bishunzwe: Utubuto ya:  Bya i Abandikiwe... ; OYA Kuri i "
+"&Ubutumwa NIBA Shyiraho Umutekano . "
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 #, fuzzy
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr "Ikiranga Ibuze "
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 #, fuzzy
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "OYA /yakorewe iyinjizaporogaramu Cyangwa OYA Kuri Koresha /. "
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 #, fuzzy
 msgid "Encryption Key Selection"
 msgstr "Kopi y'urufunguzo rw'ishiraho ry'umutekano"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 #, fuzzy
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
@@ -214,7 +228,7 @@ msgstr ""
 "\n"
 "- Guhitamo i Urufunguzo ( S ) Byakoreshejwe ya:  iyi Uwandikiwe . "
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 #, fuzzy
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
@@ -227,7 +241,7 @@ msgstr ""
 "\n"
 "i Urufunguzo ( S ) Byakoreshejwe ya:  iyi Uwandikiwe . "
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 #, fuzzy
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
@@ -292,8 +306,8 @@ msgstr "; OYA Shyiraho Umukono . "
 #: kpgpbase2.cpp:205
 #, fuzzy
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr "Byanze : Kugenzura , i Imikorere , na i Urufunguzo Impeta . "
 
 #: kpgpbase2.cpp:213
@@ -342,8 +356,8 @@ msgstr "ni Bitemewe . "
 #: kpgpbase5.cpp:154
 #, fuzzy
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Urufunguzo ( S ) Kuri Shyiraho Umutekano &Ubutumwa Kuri OYA . Bishunzwe: "
 "Byakozwe . "
@@ -403,7 +417,7 @@ msgstr "Byanze Ibanga Urufunguzo ni . "
 msgid "Error running gpg"
 msgstr "Ikosa GPG "
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 #, fuzzy
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "(Idosiye."
@@ -420,6 +434,11 @@ msgid ""
 "\"%1\":"
 msgstr "Injiza i \" %1 \" : "
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Iburira"
+
 #: kpgpui.cpp:121
 #, fuzzy
 msgid ""
@@ -467,6 +486,10 @@ msgstr "6 . x "
 msgid "Do not use any encryption tool"
 msgstr "OYA Koresha Icyo ari cyo cyose Bishunzwe: "
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 #, fuzzy
 msgid "&Keep passphrase in memory"
@@ -475,24 +498,22 @@ msgstr "in Ububiko "
 #: kpgpui.cpp:161
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt> "
-"<p> iyi Ihitamo ni Bikora , i Bya By'umwihariko Urufunguzo ku i Porogaramu Nka "
-"Birebire Nka i Porogaramu ni . Kuri Injiza i Rimwe . </p> "
-"<p> iyi A Umutekano . , Ibindi: Koresha Kuri Kohereza Ubutumwa na /Cyangwa Soma "
-"Bishunzwe: Ubutumwa . A , i Ibigize Bya Disiki%1 , . </p> "
-"<p> icyitonderwa Ryari: ikoresha , iyi Igenamiterere NIBA OYA ikoresha GPG - "
-"Umukozi . ni NIBA ikoresha Amacomeka . </p> </qt> "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt> <p> iyi Ihitamo ni Bikora , i Bya By'umwihariko Urufunguzo ku i "
+"Porogaramu Nka Birebire Nka i Porogaramu ni . Kuri Injiza i Rimwe . </p> <p> "
+"iyi A Umutekano . , Ibindi: Koresha Kuri Kohereza Ubutumwa na /Cyangwa Soma "
+"Bishunzwe: Ubutumwa . A , i Ibigize Bya Disiki%1 , . </p> <p> icyitonderwa "
+"Ryari: ikoresha , iyi Igenamiterere NIBA OYA ikoresha GPG - Umukozi . ni "
+"NIBA ikoresha Amacomeka . </p> </qt> "
 
 #: kpgpui.cpp:174
 #, fuzzy
@@ -502,16 +523,14 @@ msgstr "Shyiraho Umutekano Kuri "
 #: kpgpui.cpp:179
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Ihitamo ni Bikora , i &Ubutumwa /Idosiye OYA Bishunzwe: Na: i public "
-"Urufunguzo , Na: Urufunguzo . Gushoboza Kuri i &Ubutumwa /Idosiye Ku A Nyuma "
-"Igihe . ni A . </p> </qt> "
+"<qt> <p> iyi Ihitamo ni Bikora , i &Ubutumwa /Idosiye OYA Bishunzwe: Na: i "
+"public Urufunguzo , Na: Urufunguzo . Gushoboza Kuri i &Ubutumwa /Idosiye Ku "
+"A Nyuma Igihe . ni A . </p> </qt> "
 
 #: kpgpui.cpp:188
 #, fuzzy
@@ -521,15 +540,14 @@ msgstr "/Bishunzwe: Umwandiko Nyuma "
 #: kpgpui.cpp:194
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Ihitamo ni Bikora , i /Bishunzwe: Umwandiko in A Idirishya , Kuri "
-"Kureba Mbere ni Yoherejwe: . ni A Ryari: Bishunzwe: Sisitemu . </p> </qt> "
+"<qt> <p> iyi Ihitamo ni Bikora , i /Bishunzwe: Umwandiko in A Idirishya , "
+"Kuri Kureba Mbere ni Yoherejwe: . ni A Ryari: Bishunzwe: Sisitemu . </p> </"
+"qt> "
 
 #: kpgpui.cpp:200
 #, fuzzy
@@ -539,17 +557,16 @@ msgstr "Herekana %S i Bishunzwe: Utubuto ya:  "
 #: kpgpui.cpp:205
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt> "
-"<p> iyi Ihitamo ni Bikora , i Porogaramu Buri gihe Herekana %S A Urutonde Bya "
-"public Utubuto Kuva: Hitamo... i Rimwe Koresha ya:  Bishunzwe: . ni Bidakora , "
-"i Porogaramu Herekana %S i Ikiganiro NIBA Gushaka i Iburyo: Urufunguzo Cyangwa "
-"NIBA Byakoreshejwe . </p> </qt> "
+"<qt> <p> iyi Ihitamo ni Bikora , i Porogaramu Buri gihe Herekana %S A "
+"Urutonde Bya public Utubuto Kuva: Hitamo... i Rimwe Koresha ya:  "
+"Bishunzwe: . ni Bidakora , i Porogaramu Herekana %S i Ikiganiro NIBA Gushaka "
+"i Iburyo: Urufunguzo Cyangwa NIBA Byakoreshejwe . </p> </qt> "
 
 #: kpgpui.cpp:327
 #, fuzzy
@@ -573,9 +590,8 @@ msgstr "Kwibuka"
 #: kpgpui.cpp:354
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr "<qt> <p> Kugenzura iyi Agasanduku na OYA Nanone . </p> </qt> "
 
 #: kpgpui.cpp:391
@@ -690,6 +706,10 @@ msgstr "Guhitamo Ipaji"
 msgid "Please select an OpenPGP key to use."
 msgstr "Guhitamo Urufunguzo Kuri Koresha . "
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Guhindura"
diff --git a/tde-i18n-sk/messages/tdepim/libkpgp.po b/tde-i18n-sk/messages/tdepim/libkpgp.po
index f1b473b8a64..75fa28eccd7 100644
--- a/tde-i18n-sk/messages/tdepim/libkpgp.po
+++ b/tde-i18n-sk/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2006-08-17 06:53+0200\n"
 "Last-Translator: Jozef Říha <jose1711@gmail.com>\n"
 "Language-Team: slovak\n"
@@ -16,6 +16,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -36,7 +48,7 @@ msgstr "Slovníková fráza je príliš dlhá, musí mať menej ako 1024 znakov.
 msgid "Out of memory."
 msgstr "Málo pamäte."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -44,16 +56,16 @@ msgstr ""
 "Zadali ste neplatnú slovníkovú frázu.\n"
 "Chcete to skúsiť znova alebo stornovať a vidieť správu nerozšifrovanú?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP upozornenie"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Opakovať"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -63,11 +75,11 @@ msgstr ""
 "Chcete to skúsiť znova alebo pokračovať a nechať správu nepodpísanú alebo "
 "stornovať poslanie správy?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Poslať &nepodpísané"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -76,26 +88,26 @@ msgstr ""
 "%1\n"
 "Chcete poslať správu nepodpísanú alebo stornovať poslanie?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Chcete šifrovanie v každom prípade, nechať správu ako je alebo stornovať "
 "poslanie správy?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Poslať z&ašifrované"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Poslať &nezašifrované"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -104,11 +116,11 @@ msgstr ""
 "%1\n"
 "Chcete nechať správu ako je alebo stornovať poslanie správy?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Po&slat ako je"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +129,7 @@ msgstr ""
 "Nastala nasledujúca chyba:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,7 +137,7 @@ msgstr ""
 "Toto je chybová správa od %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -133,15 +145,15 @@ msgstr ""
 "Nevybrali ste kľúč šifrovania pre prijímateľa správy, preto správa nebude "
 "zašifrovaná."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Nevybrali ste kľúč šifrovania pre žiadneho prijímateľa tejto správy, preto "
 "správa nebude zašifrovaná."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -149,15 +161,15 @@ msgstr ""
 "Nevybrali ste kľúč šifrovania pre jedného z prijímatelov, táto osoba nebude "
 "môcť dešifrovať správu ak ju zašifrujete."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Nevybrali ste kľúč šifrovania pre miektorých prijímatelov, tieto osoby nebudú "
-"môcť dešifrovať správu ak ju zašifrujete."
+"Nevybrali ste kľúč šifrovania pre miektorých prijímatelov, tieto osoby "
+"nebudú môcť dešifrovať správu ak ju zašifrujete."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,17 +177,17 @@ msgstr ""
 "Táto vlastnosť\n"
 "stále chýba"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Buď nemáte nainštalované GnuPG/PGP alebo ste zvolili nepoužiť GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Voľba kľúča šifrovania"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -185,9 +197,10 @@ msgid ""
 msgstr ""
 "Problém s kľúčom(mi) šifrovania pre \"%1\".\n"
 "\n"
-"Prosím, zvolte znova kľúč(e), ktoré by mali byť použité pre tohoto prijímateľa."
+"Prosím, zvolte znova kľúč(e), ktoré by mali byť použité pre tohoto "
+"prijímateľa."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -199,7 +212,7 @@ msgstr ""
 "\n"
 "Zvolte kľúč(e), ktorý by mal byť použitý pre tohoto prijímatela."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -257,11 +270,11 @@ msgstr "Zlá slovníková fráza, nedá sa podpísať."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Podpísanie zlyhalo: prosím, skontrolujte, že PGP User Identity, nastavenia PGP "
-"a kľúčové kruhy."
+"Podpísanie zlyhalo: prosím, skontrolujte, že PGP User Identity, nastavenia "
+"PGP a kľúčové kruhy."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -302,11 +315,11 @@ msgstr "Zadaná slovníková fráza je neplatná."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Kľúč(e), ktorým chcete zašifrovať správu nie sú dôveryhodné. Žiadne šifrovanie "
-"nebolo."
+"Kľúč(e), ktorým chcete zašifrovať správu nie sú dôveryhodné. Žiadne "
+"šifrovanie nebolo."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -355,7 +368,7 @@ msgstr "Podpísanie zlyhalo, pretože tajný kľúč je nepoužiteľný."
 msgid "Error running gpg"
 msgstr "Chyba spustenia gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (nenájdený súbor ~/.gnupg/pubring.gpg)"
 
@@ -371,6 +384,11 @@ msgstr ""
 "Prosím zadajte OpenPGP slovníkovú frázu pre\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP upozornenie"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -411,33 +429,35 @@ msgstr "PGP verzia 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Nepoužiť žiadny šifrovací nástroj"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Ponechať slovníkovú frázu v pamäti"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ak je táto možnosť povolená, slovníková fráza privátneho kľúča si aplikácia "
-"zapamätábe tak dlho ako bude spustená. Takto slovníkovú frázu budete musieť "
-"zadať iba raz.</p>"
-"<p>Buďte si vedomý, že toto môže byť bezpečnostné riziko. Ak necháte počítač "
-"ostatný ho môžu použiť na poslanie podpísanej správy a/alebo prečítať Vaše "
-"zašifrované správy. Ak nastane výpis jadra, obsah pamäte sa zapíše na disk "
-"vrátane Vašej slovníkovej frázy. </p>"
-"<p>Poznámka ak používate KMail, toto nastavenie sa aplikuje len ak používate "
-"gpg-agent. Je taktiež ignorované ak používate crypto moduly.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Ak je táto možnosť povolená, slovníková fráza privátneho kľúča si "
+"aplikácia zapamätábe tak dlho ako bude spustená. Takto slovníkovú frázu "
+"budete musieť zadať iba raz.</p><p>Buďte si vedomý, že toto môže byť "
+"bezpečnostné riziko. Ak necháte počítač ostatný ho môžu použiť na poslanie "
+"podpísanej správy a/alebo prečítať Vaše zašifrované správy. Ak nastane výpis "
+"jadra, obsah pamäte sa zapíše na disk vrátane Vašej slovníkovej frázy. </"
+"p><p>Poznámka ak používate KMail, toto nastavenie sa aplikuje len ak "
+"používate gpg-agent. Je taktiež ignorované ak používate crypto moduly.</p></"
+"qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -445,16 +465,15 @@ msgstr "Vždy ši&frovať na mňa"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ak je táto možnosť povolená, správa/súbor nebude zašifrovaná len verejným "
-"kľúčom prijímateľa, ale aj s Vašim kľúčom. Toto Vám umožní dešifrovať "
-"správu/súbor neskôr. Toto je vo všeobecnosti dobrá myšlienka.</p></qt>"
+"<qt><p>Ak je táto možnosť povolená, správa/súbor nebude zašifrovaná len "
+"verejným kľúčom prijímateľa, ale aj s Vašim kľúčom. Toto Vám umožní "
+"dešifrovať správu/súbor neskôr. Toto je vo všeobecnosti dobrá myšlienka.</"
+"p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -462,16 +481,14 @@ msgstr "&Zobraziť podpísaný/zašifrovaný text po vytvorení"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ak je táto možnosť povolená, podpísaný/zašifrovaný text sa zobrazí vo "
-"vlastnom okne, aby ste sa mohli pozrieť ako vyzera pre tým ako sa pošle. Toto "
-"je dobrá myšlienka ak preverujete, či šifrovací systém funguje.</p></qt>"
+"<qt><p>Ak je táto možnosť povolená, podpísaný/zašifrovaný text sa zobrazí vo "
+"vlastnom okne, aby ste sa mohli pozrieť ako vyzera pre tým ako sa pošle. "
+"Toto je dobrá myšlienka ak preverujete, či šifrovací systém funguje.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -479,17 +496,16 @@ msgstr "Vždy zobraziť kľúče šifrovania na &schválenie"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Ak je táto možnosť povolená, aplikácia vždy zobrazí zoznam verejných kľúčov, "
-"z ktorého si môžte vybrať jeden, ktorý sa použije na šifrovanie. Ak je vypnutá, "
-"aplikácia zobrazí dialóg len ak nevie nájsť správny kľúč alebo ak je ich je "
-"niekoľko použiteľných. </p></qt>"
+"<qt><p>Ak je táto možnosť povolená, aplikácia vždy zobrazí zoznam verejných "
+"kľúčov, z ktorého si môžte vybrať jeden, ktorý sa použije na šifrovanie. Ak "
+"je vypnutá, aplikácia zobrazí dialóg len ak nevie nájsť správny kľúč alebo "
+"ak je ich je niekoľko použiteľných. </p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -509,12 +525,10 @@ msgstr "Zapamätať si voľbu"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ak zaškrtnete, voľba sa uloží a už sa nebude znova pýtať.</p></qt>"
+"<qt><p>Ak zaškrtnete, voľba sa uloží a už sa nebude znova pýtať.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -613,6 +627,10 @@ msgstr "Voľba OpenPGP kľúča"
 msgid "Please select an OpenPGP key to use."
 msgstr "Prosim, vyberte OpenPGP kľúč, ktorý sa použije."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Zmeniť..."
diff --git a/tde-i18n-sl/messages/tdepim/libkpgp.po b/tde-i18n-sl/messages/tdepim/libkpgp.po
index 1d44e26d6f3..d9218485b74 100644
--- a/tde-i18n-sl/messages/tdepim/libkpgp.po
+++ b/tde-i18n-sl/messages/tdepim/libkpgp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-03-11 12:59+0100\n"
 "Last-Translator: Gregor Rakar <gregor.rakar@kiss.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -36,7 +48,7 @@ msgstr "Šifrirna fraza je predolga, vsebovati mora manj kot 1024 znakov."
 msgid "Out of memory."
 msgstr "Zmanjkalo pomnilnika."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -44,16 +56,16 @@ msgstr ""
 "Pravkar ste vnesli neveljavno šifrirno frazo.\n"
 "Želite poskusiti znova ali preklicati in videti sporočilo nedešifrirano?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Opozorilo PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Ponovi"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -63,11 +75,11 @@ msgstr ""
 "Želite poskusiti znova, nadaljevati in pustiti sporočilo nepodpisano ali "
 "preklicati pošiljanje sporočila?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Pošlji &nepodpisano"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -76,26 +88,26 @@ msgstr ""
 "%1\n"
 "Želite poslati sporočilo nepodpisano ali preklicati pošiljanje sporočila?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Ali vseeno želite šifrirati, pustiti sporočilo pri miru ali preklicati "
 "pošiljanje sporočila?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Pošlji ši&frirano"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Pošlji n&ešifrirano"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -104,11 +116,11 @@ msgstr ""
 "%1\n"
 "Ali želite pustiti sporočilo pri miru ali preklicati pošiljanje sporočila?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Pošlji &kot je"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +129,7 @@ msgstr ""
 "Prišlo je do naslednje napake:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,23 +137,23 @@ msgstr ""
 "To je sporočilo o napaki v %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"Niste izbrali šifrirnega ključa za prejemnika tega sporočila. Sporočilo ne bo "
-"šifrirano."
+"Niste izbrali šifrirnega ključa za prejemnika tega sporočila. Sporočilo ne "
+"bo šifrirano."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Niste izbrali šifrirnega ključa za kateregakoli od prejemnikov tega sporočila. "
-"Sporočilo ne bo šifrirano."
+"Niste izbrali šifrirnega ključa za kateregakoli od prejemnikov tega "
+"sporočila. Sporočilo ne bo šifrirano."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -149,15 +161,15 @@ msgstr ""
 "Niste izbrali šifrirnega ključa za enega izmed prejemnikov. Ta oseba ne bo "
 "mogla dešifrirati sporočila."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Niste izbrali šifrirnega ključa za nekatere izmed prejemnikov. Te osebe ne bodo "
-"mogle dešifrirati sporočila, če ga zašifrirate."
+"Niste izbrali šifrirnega ključa za nekatere izmed prejemnikov. Te osebe ne "
+"bodo mogle dešifrirati sporočila, če ga zašifrirate."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,18 +177,18 @@ msgstr ""
 "Žal ta zmožnost\n"
 "še ne obstaja"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Ali nimate nameščenega GnuPG/PGP ali pa ste izbrali, da ga ne želite "
 "uporabljati."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Izbira šifrirnaga ključa"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,7 +200,7 @@ msgstr ""
 "\n"
 "Prosim znova izberite ključe, ki naj bodo uporabljeni za tega prejemnika."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -200,7 +212,7 @@ msgstr ""
 "\n"
 "Izberite ključe, ki naj bodo uporabljeni za tega prejemnika."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -238,7 +250,8 @@ msgid ""
 "%1.\n"
 "The message is not encrypted."
 msgstr ""
-"Javni ključi, ki niso certificirani z zaupanim podpisom za uporabniške ID-je\n"
+"Javni ključi, ki niso certificirani z zaupanim podpisom za uporabniške ID-"
+"je\n"
 "%1.\n"
 "Sporočilo ne bo šifrirano."
 
@@ -248,7 +261,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"Javni ključi, ki niso certificirani z zaupanim podpisom za uporabniške ID-je\n"
+"Javni ključi, ki niso certificirani z zaupanim podpisom za uporabniške ID-"
+"je\n"
 "%1.\n"
 "Te osebe ne bodo mogle dešifrirati sporočila."
 
@@ -258,11 +272,11 @@ msgstr "Slaba šifrirna fraza; ni moč podpisati."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Podpis ni uspel. Preverite vašo uporabniško identiteto PGP, vaše nastavitve PGP "
-"in skupke ključev."
+"Podpis ni uspel. Preverite vašo uporabniško identiteto PGP, vaše nastavitve "
+"PGP in skupke ključev."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -302,11 +316,11 @@ msgstr "Vnesli ste nepravilno šifrirno frazo."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
-"Ključ(i), s katerim(i) ste hoteli šifrirati sporočilo, niso zaupani. Šifriranje "
-"ni bilo opravljeno."
+"Ključ(i), s katerim(i) ste hoteli šifrirati sporočilo, niso zaupani. "
+"Šifriranje ni bilo opravljeno."
 
 #: kpgpbase5.cpp:157
 msgid ""
@@ -355,7 +369,7 @@ msgstr "Podpisovanje ni uspelo, ker je vaš skriti ključ neuporaben."
 msgid "Error running gpg"
 msgstr "Napaka pri poganjanju gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (datoteka ~/.gnupg/pubring.gpg ni bila najdena)"
 
@@ -371,13 +385,18 @@ msgstr ""
 "Prosim vnesite šifrirno frazo OpenPGP za\n"
 "»%1«:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Opozorilo PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Prosim preverite, če šifriranje res deluje preden ga začnete resno uporabljati. "
-"Prav tako vedite, da priloge niso šifrirane z modulom PGP/GPG."
+"Prosim preverite, če šifriranje res deluje preden ga začnete resno "
+"uporabljati. Prav tako vedite, da priloge niso šifrirane z modulom PGP/GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -411,33 +430,34 @@ msgstr "PGP različica 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Ne uporabi nobenega šifrirnega orodja"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Ohrani šifrirno frazo v spominu"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kadar je omogočena ta možnost, si bo program dokler teče zapomnil šifrirno "
-"frazo vašega zasebnega ključa. To pomeni, da boste morali vnesti geslo le "
-"enkrat.</p>"
-"<p>Zavedajte se, da lahko to predstavlja varnostno tveganje. Če zapustite "
-"računalnik lahko drugi pošiljajo in/ali berejo podpisana sporočila. Če pride do "
-"sesutja programa, se vsebina pomnilnika shrani na disk, vključno z vašo "
-"šifrirno frazo.</p>"
-"<p>Upoštevajte da pri uporabi KMaila ta nastavitev velja le če ne uporabljate "
-"agenta gpg. Prav tako se spregleda pri uporabi šifrirnih vstavkov.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Kadar je omogočena ta možnost, si bo program dokler teče zapomnil "
+"šifrirno frazo vašega zasebnega ključa. To pomeni, da boste morali vnesti "
+"geslo le enkrat.</p><p>Zavedajte se, da lahko to predstavlja varnostno "
+"tveganje. Če zapustite računalnik lahko drugi pošiljajo in/ali berejo "
+"podpisana sporočila. Če pride do sesutja programa, se vsebina pomnilnika "
+"shrani na disk, vključno z vašo šifrirno frazo.</p><p>Upoštevajte da pri "
+"uporabi KMaila ta nastavitev velja le če ne uporabljate agenta gpg. Prav "
+"tako se spregleda pri uporabi šifrirnih vstavkov.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -445,17 +465,15 @@ msgstr "Vedno šifrira&j sebi"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kadar je omogočena ta možnost bo sporočilo/datoteka zašifrirano ne le s "
-"prejemnikovim javnim ključem ampak tudi z vašim ključem. To vam bo omogočilo "
-"dešifriranje sporočila/datoteke kdaj pozneje. To je v splošnem dobra ideja.</p>"
-"</qt> "
+"<qt><p>Kadar je omogočena ta možnost bo sporočilo/datoteka zašifrirano ne le "
+"s prejemnikovim javnim ključem ampak tudi z vašim ključem. To vam bo "
+"omogočilo dešifriranje sporočila/datoteke kdaj pozneje. To je v splošnem "
+"dobra ideja.</p></qt> "
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -463,16 +481,15 @@ msgstr "&Prikaži šifrirano/podpisano besedilo po sestavljanju"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kadar je omogočena ta možnost bo podpisano/šifrirano besedilo prikazano v "
-"ločenem oknu, da tako da si ga boste lahko ogledali, preden ga pošljete. To je "
-"dobra ideja, ko preverjate, kako deluje šifrini sistem.</p></qt>"
+"<qt><p>Kadar je omogočena ta možnost bo podpisano/šifrirano besedilo "
+"prikazano v ločenem oknu, da tako da si ga boste lahko ogledali, preden ga "
+"pošljete. To je dobra ideja, ko preverjate, kako deluje šifrini sistem.</p></"
+"qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -480,18 +497,17 @@ msgstr "Vedno prikaži šifrirne ključe &za odobritev"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Kadar je omogočena ta možnost, bo program vedno prikazal seznam javnih "
-"ključev med katerimi lahko izberete tistega, ki ga boste uporabili za "
-"šifriranje. Če je možnost izključena, bo program prikazal pogovorno okno le, če "
-"ne bo mogel najti pravega ključa ali če je na voljo več takšnih, ki bi se lahko "
-"uporabili.</p></qt>"
+"<qt><p>Kadar je omogočena ta možnost, bo program vedno prikazal seznam "
+"javnih ključev med katerimi lahko izberete tistega, ki ga boste uporabili za "
+"šifriranje. Če je možnost izključena, bo program prikazal pogovorno okno le, "
+"če ne bo mogel najti pravega ključa ali če je na voljo več takšnih, ki bi se "
+"lahko uporabili.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -511,13 +527,11 @@ msgstr "Zapomni si izbiro"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Če izberete to možnost, potem bo vaša izbira shranjena in ne boste več "
-"vprašani zanjo.</p></qt>"
+"<qt><p>Če izberete to možnost, potem bo vaša izbira shranjena in ne boste "
+"več vprašani zanjo.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -616,6 +630,10 @@ msgstr "Izbor ključa OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Prosim izberite ključ OpenPGP za uporabo."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Spremeni ..."
diff --git a/tde-i18n-sr/messages/tdepim/libkpgp.po b/tde-i18n-sr/messages/tdepim/libkpgp.po
index 161ee38948d..acf1842331e 100644
--- a/tde-i18n-sr/messages/tdepim/libkpgp.po
+++ b/tde-i18n-sr/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-03-17 10:44+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr "Лозинка је предугачка, мора садржати ма
 msgid "Out of memory."
 msgstr "Нема меморије."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,16 +54,16 @@ msgstr ""
 "Управо сте унели неисправну лозинку.\n"
 "Желите ли да покушате опет, или одустанете и прикажете поруку недешифровану?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Упозорење PGP-а"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Покушај поново"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,11 +73,11 @@ msgstr ""
 "Желите ли да покушате поново, наставите и оставите поруку непотписану, или "
 "откажете слање поруке?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Пошаљи &непотписано"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -74,26 +86,26 @@ msgstr ""
 "%1\n"
 "Желите ли да пошаљете поруку непотписану, или да откажете слање поруке?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Желите ли ипак да шифрујете, оставите поруку каква је, или откажете слање "
 "поруке?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Пошаљи ш&ифровано"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Пошаљи &нешифровано"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -102,11 +114,11 @@ msgstr ""
 "%1\n"
 "Желите ли да оставите поруку каква је, или да откажете слање поруке?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Пошаљи каква је"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -115,7 +127,7 @@ msgstr ""
 "Дошло је до следеће грешке:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -123,7 +135,7 @@ msgstr ""
 "Ово је порука о грешци од %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -131,15 +143,15 @@ msgstr ""
 "Нисте изабрали шифрарски кључ за примаоца ове поруке; порука зато неће бити "
 "шифрована."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Нисте изабрали шифрарски кључ ни за једног од прималаца ове поруке; порука зато "
-"неће бити шифрована."
+"Нисте изабрали шифрарски кључ ни за једног од прималаца ове поруке; порука "
+"зато неће бити шифрована."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -147,7 +159,7 @@ msgstr ""
 "Нисте изабрали шифрарски кључ за једног од прималаца; та особа неће моћи да "
 "дешифрује поруку ако је шифрујете."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -155,7 +167,7 @@ msgstr ""
 "Нисте изабрали шифрарске кључеве за неке од прималаца; те особе неће моћи да "
 "дешифрују поруку ако је шифрујете."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -163,17 +175,17 @@ msgstr ""
 "Ова могућност и\n"
 "даље недостаје"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Или вам GnuPG/PGP није инсталиран, или сте изабрали да их не користите."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Избор шифрарског кључа"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -185,7 +197,7 @@ msgstr ""
 "\n"
 "Изаберите поново кључеве које треба користити за овог примаоца."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -197,7 +209,7 @@ msgstr ""
 "\n"
 "Изаберите кључеве које треба користити за овог примаоца."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -255,8 +267,8 @@ msgstr "Лоша лозинка; не могу да потпишем."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Потписивање није успело: проверите свој PGP кориснички идентитет, подешавања "
 "PGP-а и прстене кључева."
@@ -299,8 +311,8 @@ msgstr "Лозинка коју сте унели није исправна."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Кључеви којима желите да шифрујуте поруку нису од поверења. Порука није "
 "шифрована."
@@ -352,7 +364,7 @@ msgstr "Потписивање није успело јер је ваш тајн
 msgid "Error running gpg"
 msgstr "Грешка при извршавању gpg-а"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (фајл ~/.gnupg/pubring.gpg није нађен)"
 
@@ -368,6 +380,11 @@ msgstr ""
 "Унесите OpenPGP лозинку за\n"
 "„%1“:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Упозорење PGP-а"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -408,31 +425,32 @@ msgstr "PGP верзије 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Не користи шифрарски алат"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Задржи лозинку у меморији"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Када је ова опција укључена, програм ће памтити лозинку вашег приватног "
-"кључа све време извршавања.</p>"
-"<p>Будите свесни да то може бити безбедносни ризик. Ако напустите рачунар, "
-"други га могу користити за слање потписаних порука и читање ваших шифрованих "
-"порука. Ако дође до избачаја језгра, садржај меморије биће снимљен на диск, "
-"укључујући и вашу лозинку.</p>"
-"<p>Када користите KMail, ова могућност се користи само ако не користите "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Када је ова опција укључена, програм ће памтити лозинку вашег "
+"приватног кључа све време извршавања.</p><p>Будите свесни да то може бити "
+"безбедносни ризик. Ако напустите рачунар, други га могу користити за слање "
+"потписаних порука и читање ваших шифрованих порука. Ако дође до избачаја "
+"језгра, садржај меморије биће снимљен на диск, укључујући и вашу лозинку.</"
+"p><p>Када користите KMail, ова могућност се користи само ако не користите "
 "gpg-agent. Такође се ингорише ако користите шифроприкључке.</p></qt>"
 
 #: kpgpui.cpp:174
@@ -441,14 +459,12 @@ msgstr "Увек шифруј и &мени"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Када је ова опција укључена, порука/фајл ће бити шифрован не само "
+"<qt><p>Када је ова опција укључена, порука/фајл ће бити шифрован не само "
 "примаочевим јавним кључем, већ и вашим кључем. Тако ћете касније моћи да "
 "дешфрујете поруку/фајл. Ово је обично добра идеја.</p></qt>"
 
@@ -458,16 +474,15 @@ msgstr "&Прикажи потписан/шифрован текст после
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Када је ова опција укључена, потписан/шифрован текст биће приказан у "
-"засебном прозору, омогућавајући вам да пре слања видите како ће изгледати. Ово "
-"је добар начин да проверите да ли ваш шифрарски систем заиста ради.</p></qt>"
+"<qt><p>Када је ова опција укључена, потписан/шифрован текст биће приказан у "
+"засебном прозору, омогућавајући вам да пре слања видите како ће изгледати. "
+"Ово је добар начин да проверите да ли ваш шифрарски систем заиста ради.</p></"
+"qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -475,17 +490,16 @@ msgstr "Увек прикажи шифрарске кључеве &за одоб
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Када је ова опција укључена, програм ће вам увек приказати листу јавних "
-"кључева из које можете изабрати један за шифровање. Ако је искључена, програм "
-"ће приказати листу само ако не може да нађе прави кључ или ако постоји више "
-"кључева који се могу употребити.</p></qt>"
+"<qt><p>Када је ова опција укључена, програм ће вам увек приказати листу "
+"јавних кључева из које можете изабрати један за шифровање. Ако је искључена, "
+"програм ће приказати листу само ако не може да нађе прави кључ или ако "
+"постоји више кључева који се могу употребити.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -505,13 +519,11 @@ msgstr "Запамти избор"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ако попуните ову кућицу, ваш избор ће бити запамћен и нећете бити поново "
-"питани.</p></qt>"
+"<qt><p>Ако попуните ову кућицу, ваш избор ће бити запамћен и нећете бити "
+"поново питани.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -610,6 +622,10 @@ msgstr "Избор OpenPGP кључа"
 msgid "Please select an OpenPGP key to use."
 msgstr "Изаберите OpenPGP кључ који ће се користити."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Измени..."
diff --git a/tde-i18n-sr@Latn/messages/tdepim/libkpgp.po b/tde-i18n-sr@Latn/messages/tdepim/libkpgp.po
index 30758488ee4..0f171f7eb2c 100644
--- a/tde-i18n-sr@Latn/messages/tdepim/libkpgp.po
+++ b/tde-i18n-sr@Latn/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-03-17 10:44+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -34,7 +46,7 @@ msgstr "Lozinka je predugačka, mora sadržati manje od 1024 znaka."
 msgid "Out of memory."
 msgstr "Nema memorije."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -42,16 +54,16 @@ msgstr ""
 "Upravo ste uneli neispravnu lozinku.\n"
 "Želite li da pokušate opet, ili odustanete i prikažete poruku nedešifrovanu?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Upozorenje PGP-a"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Pokušaj ponovo"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,11 +73,11 @@ msgstr ""
 "Želite li da pokušate ponovo, nastavite i ostavite poruku nepotpisanu, ili "
 "otkažete slanje poruke?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Pošalji &nepotpisano"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -74,26 +86,26 @@ msgstr ""
 "%1\n"
 "Želite li da pošaljete poruku nepotpisanu, ili da otkažete slanje poruke?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Želite li ipak da šifrujete, ostavite poruku kakva je, ili otkažete slanje "
 "poruke?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Pošalji š&ifrovano"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Pošalji &nešifrovano"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -102,11 +114,11 @@ msgstr ""
 "%1\n"
 "Želite li da ostavite poruku kakva je, ili da otkažete slanje poruke?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Pošalji kakva je"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -115,7 +127,7 @@ msgstr ""
 "Došlo je do sledeće greške:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -123,7 +135,7 @@ msgstr ""
 "Ovo je poruka o grešci od %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -131,15 +143,15 @@ msgstr ""
 "Niste izabrali šifrarski ključ za primaoca ove poruke; poruka zato neće biti "
 "šifrovana."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Niste izabrali šifrarski ključ ni za jednog od primalaca ove poruke; poruka "
 "zato neće biti šifrovana."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -147,15 +159,15 @@ msgstr ""
 "Niste izabrali šifrarski ključ za jednog od primalaca; ta osoba neće moći da "
 "dešifruje poruku ako je šifrujete."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Niste izabrali šifrarske ključeve za neke od primalaca; te osobe neće moći da "
-"dešifruju poruku ako je šifrujete."
+"Niste izabrali šifrarske ključeve za neke od primalaca; te osobe neće moći "
+"da dešifruju poruku ako je šifrujete."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -163,17 +175,17 @@ msgstr ""
 "Ova mogućnost i\n"
 "dalje nedostaje"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Ili vam GnuPG/PGP nije instaliran, ili ste izabrali da ih ne koristite."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Izbor šifrarskog ključa"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -185,7 +197,7 @@ msgstr ""
 "\n"
 "Izaberite ponovo ključeve koje treba koristiti za ovog primaoca."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -197,7 +209,7 @@ msgstr ""
 "\n"
 "Izaberite ključeve koje treba koristiti za ovog primaoca."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -255,11 +267,11 @@ msgstr "Loša lozinka; ne mogu da potpišem."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Potpisivanje nije uspelo: proverite svoj PGP korisnički identitet, podešavanja "
-"PGP-a i prstene ključeva."
+"Potpisivanje nije uspelo: proverite svoj PGP korisnički identitet, "
+"podešavanja PGP-a i prstene ključeva."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -300,8 +312,8 @@ msgstr "Lozinka koju ste uneli nije ispravna."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Ključevi kojima želite da šifrujute poruku nisu od poverenja. Poruka nije "
 "šifrovana."
@@ -353,7 +365,7 @@ msgstr "Potpisivanje nije uspelo jer je vaš tajni ključ neupotrebljiv."
 msgid "Error running gpg"
 msgstr "Greška pri izvršavanju gpg-a"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (fajl ~/.gnupg/pubring.gpg nije nađen)"
 
@@ -369,6 +381,11 @@ msgstr ""
 "Unesite OpenPGP lozinku za\n"
 "„%1“:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Upozorenje PGP-a"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -409,31 +426,32 @@ msgstr "PGP verzije 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Ne koristi šifrarski alat"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Zadrži lozinku u memoriji"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Kada je ova opcija uključena, program će pamtiti lozinku vašeg privatnog "
-"ključa sve vreme izvršavanja.</p>"
-"<p>Budite svesni da to može biti bezbednosni rizik. Ako napustite računar, "
-"drugi ga mogu koristiti za slanje potpisanih poruka i čitanje vaših šifrovanih "
-"poruka. Ako dođe do izbačaja jezgra, sadržaj memorije biće snimljen na disk, "
-"uključujući i vašu lozinku.</p>"
-"<p>Kada koristite KMail, ova mogućnost se koristi samo ako ne koristite "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Kada je ova opcija uključena, program će pamtiti lozinku vašeg "
+"privatnog ključa sve vreme izvršavanja.</p><p>Budite svesni da to može biti "
+"bezbednosni rizik. Ako napustite računar, drugi ga mogu koristiti za slanje "
+"potpisanih poruka i čitanje vaših šifrovanih poruka. Ako dođe do izbačaja "
+"jezgra, sadržaj memorije biće snimljen na disk, uključujući i vašu lozinku.</"
+"p><p>Kada koristite KMail, ova mogućnost se koristi samo ako ne koristite "
 "gpg-agent. Takođe se ingoriše ako koristite šifropriključke.</p></qt>"
 
 #: kpgpui.cpp:174
@@ -442,14 +460,12 @@ msgstr "Uvek šifruj i &meni"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kada je ova opcija uključena, poruka/fajl će biti šifrovan ne samo "
+"<qt><p>Kada je ova opcija uključena, poruka/fajl će biti šifrovan ne samo "
 "primaočevim javnim ključem, već i vašim ključem. Tako ćete kasnije moći da "
 "dešfrujete poruku/fajl. Ovo je obično dobra ideja.</p></qt>"
 
@@ -459,16 +475,15 @@ msgstr "&Prikaži potpisan/šifrovan tekst posle sastavljanja"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Kada je ova opcija uključena, potpisan/šifrovan tekst biće prikazan u "
-"zasebnom prozoru, omogućavajući vam da pre slanja vidite kako će izgledati. Ovo "
-"je dobar način da proverite da li vaš šifrarski sistem zaista radi.</p></qt>"
+"<qt><p>Kada je ova opcija uključena, potpisan/šifrovan tekst biće prikazan u "
+"zasebnom prozoru, omogućavajući vam da pre slanja vidite kako će izgledati. "
+"Ovo je dobar način da proverite da li vaš šifrarski sistem zaista radi.</p></"
+"qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -476,17 +491,16 @@ msgstr "Uvek prikaži šifrarske ključeve &za odobrenje"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Kada je ova opcija uključena, program će vam uvek prikazati listu javnih "
-"ključeva iz koje možete izabrati jedan za šifrovanje. Ako je isključena, "
-"program će prikazati listu samo ako ne može da nađe pravi ključ ili ako postoji "
-"više ključeva koji se mogu upotrebiti.</p></qt>"
+"<qt><p>Kada je ova opcija uključena, program će vam uvek prikazati listu "
+"javnih ključeva iz koje možete izabrati jedan za šifrovanje. Ako je "
+"isključena, program će prikazati listu samo ako ne može da nađe pravi ključ "
+"ili ako postoji više ključeva koji se mogu upotrebiti.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -506,13 +520,11 @@ msgstr "Zapamti izbor"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Ako popunite ovu kućicu, vaš izbor će biti zapamćen i nećete biti ponovo "
-"pitani.</p></qt>"
+"<qt><p>Ako popunite ovu kućicu, vaš izbor će biti zapamćen i nećete biti "
+"ponovo pitani.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -611,6 +623,10 @@ msgstr "Izbor OpenPGP ključa"
 msgid "Please select an OpenPGP key to use."
 msgstr "Izaberite OpenPGP ključ koji će se koristiti."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Izmeni..."
diff --git a/tde-i18n-sv/messages/tdepim/libkpgp.po b/tde-i18n-sv/messages/tdepim/libkpgp.po
index 544bf6821fc..52436c1fa72 100644
--- a/tde-i18n-sv/messages/tdepim/libkpgp.po
+++ b/tde-i18n-sv/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2005-01-20 20:28+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -36,7 +48,7 @@ msgstr ""
 msgid "Out of memory."
 msgstr "Slut på minne."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -44,71 +56,73 @@ msgstr ""
 "Du skrev just in en ogiltig lösenordsfras.\n"
 "Vill du försöka igen, eller avbryta och titta på det okrypterade meddelandet?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP-varning"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "Fö&rsök igen"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Du skrev in en ogiltig lösenordsfras.\n"
-"Vill du försöka igen, fortsätta och lämna meddelandet osignerat, eller avbryta "
-"sändning av meddelandet?"
+"Vill du försöka igen, fortsätta och lämna meddelandet osignerat, eller "
+"avbryta sändning av meddelandet?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Skicka &osignerat"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Vill du skicka meddelandet osignerat, eller avbryta sändningen av meddelandet?"
+"Vill du skicka meddelandet osignerat, eller avbryta sändningen av "
+"meddelandet?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"Vill du kryptera ändå, lämna meddelandet som det är, eller avbryta sändningen "
-"av meddelandet?"
+"Vill du kryptera ändå, lämna meddelandet som det är, eller avbryta "
+"sändningen av meddelandet?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Skicka krypt&erat"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Skicka &okrypterat"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"Vill du lämna meddelandet som det är, eller avbryta sändningen av meddelandet?"
+"Vill du lämna meddelandet som det är, eller avbryta sändningen av "
+"meddelandet?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "S&kicka som det är"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -117,7 +131,7 @@ msgstr ""
 "Följande fel uppstod:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -125,7 +139,7 @@ msgstr ""
 "Det här är felmeddelandet för %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -133,15 +147,15 @@ msgstr ""
 "Du valde inte en krypteringsnyckel för mottagaren av brevet. Därför kommer "
 "brevet inte att krypteras."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Du valde inte en krypteringsnyckel för någon av mottagarna av brevet. Därför "
 "krypteras inte brevet."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -149,15 +163,15 @@ msgstr ""
 "Du valde inte en krypteringsnyckel för en av mottagarna. Den här personen "
 "kommer inte att kunna läsa brevet om du krypterar det."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Du valde inte en krypteringsnyckel för några av mottagarna. De här personerna "
-"kommer inte att kunna läsa brevet om du krypterar det."
+"Du valde inte en krypteringsnyckel för några av mottagarna. De här "
+"personerna kommer inte att kunna läsa brevet om du krypterar det."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -165,18 +179,18 @@ msgstr ""
 "Den här funktionen\n"
 "saknas fortfarande"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
-"Du har antingen inte installerat GnuPG/PGP, eller så valde du att inte använda "
-"GnuPG/PGP."
+"Du har antingen inte installerat GnuPG/PGP, eller så valde du att inte "
+"använda GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Val av krypteringsnyckel"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -188,7 +202,7 @@ msgstr ""
 "\n"
 "Välj nyckel eller nycklar som ska användas för den här mottagaren igen."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -200,7 +214,7 @@ msgstr ""
 "\n"
 "Välj nyckeln eller nycklarna som ska användas för den här mottagaren"
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -258,11 +272,11 @@ msgstr "Felaktig lösenordsfras; kunde inte signera."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"Signering misslyckades. Kontrollera din PGP-användaridentitet, dina "
-"PGP-inställningar och nyckelringarna."
+"Signering misslyckades. Kontrollera din PGP-användaridentitet, dina PGP-"
+"inställningar och nyckelringarna."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -303,8 +317,8 @@ msgstr "Lösenordsfrasen du angav är ogiltig."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Nyckeln/Nycklarna som du vill kryptera brevet med är inte säkra. Ingen "
 "kryptering utfördes."
@@ -356,7 +370,7 @@ msgstr "Signering misslyckades eftersom din hemliga nyckel är oanvändbar."
 msgid "Error running gpg"
 msgstr "Fel vid körning av GPG"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (filen ~/.gnupg/pubring.gpg hittades inte)"
 
@@ -372,13 +386,18 @@ msgstr ""
 "Ange OpenPGP:s lösenordsfras för\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP-varning"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Kontrollera att krypteringen verkligen fungerar innan du börjar använda den på "
-"allvar. Observera också att bilagor inte krypteras av PGP/GPG-modulen."
+"Kontrollera att krypteringen verkligen fungerar innan du börjar använda den "
+"på allvar. Observera också att bilagor inte krypteras av PGP/GPG-modulen."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -412,34 +431,35 @@ msgstr "PGP-version 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Använd inget krypteringsverktyg"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Behåll l&ösenordsfrasen i minnet"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>När det här alternativet är aktiverat kommer programmet ihåg lösenordsfrasen "
-"för din privata nyckel medan det körs. På så sätt behöver du bara skriva in "
-"lösenordsfrasen en gång.</p>"
-"<p>Var medveten om att detta kan vara en säkerhetsrisk. Om du lämnar datorn, "
-"kan andra använda den för att skicka signerade meddelanden och/eller läsa dina "
-"krypterade meddelanden. Om en minnesdump skulle ske, sparas minnets innehåll på "
-"disk, inklusive lösenordsfrasen.</p>"
-"<p>Observera att när du använder Kmail, gäller inställningen bara om du inte "
-"använder GPG-agent. Den ignoreras också om du använder "
-"kryptoinsticksprogram.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>När det här alternativet är aktiverat kommer programmet ihåg "
+"lösenordsfrasen för din privata nyckel medan det körs. På så sätt behöver du "
+"bara skriva in lösenordsfrasen en gång.</p><p>Var medveten om att detta kan "
+"vara en säkerhetsrisk. Om du lämnar datorn, kan andra använda den för att "
+"skicka signerade meddelanden och/eller läsa dina krypterade meddelanden. Om "
+"en minnesdump skulle ske, sparas minnets innehåll på disk, inklusive "
+"lösenordsfrasen.</p><p>Observera att när du använder Kmail, gäller "
+"inställningen bara om du inte använder GPG-agent. Den ignoreras också om du "
+"använder kryptoinsticksprogram.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -447,17 +467,15 @@ msgstr "Kryptera alltid &till mig själv"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>När det här alternativet är aktiverat, krypteras meddelandet eller filen "
-"inte bara med mottagarens öppna nyckel, utan också med din egen nyckel. Det gör "
-"att du kan avkoda meddelandet eller filen vid ett senare tillfälle. Detta är i "
-"allmänhet en bra idé.</p></qt>"
+"<qt><p>När det här alternativet är aktiverat, krypteras meddelandet eller "
+"filen inte bara med mottagarens öppna nyckel, utan också med din egen "
+"nyckel. Det gör att du kan avkoda meddelandet eller filen vid ett senare "
+"tillfälle. Detta är i allmänhet en bra idé.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -465,17 +483,15 @@ msgstr "Vi&sa krypterad/signerad text efter redigering"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>När det här alternativet är aktiverat, visas den signerade eller krypterade "
-"texten i ett separat fönster, så att du kan veta hur den ser ut innan den "
-"skickas. Detta är en bra idé när du kontrollerar att krypteringssystemet "
-"fungerar.</p></qt>"
+"<qt><p>När det här alternativet är aktiverat, visas den signerade eller "
+"krypterade texten i ett separat fönster, så att du kan veta hur den ser ut "
+"innan den skickas. Detta är en bra idé när du kontrollerar att "
+"krypteringssystemet fungerar.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -483,17 +499,17 @@ msgstr "Visa alltid krypteringsnycklarna &för godkännande"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>När det här alternativet är aktiverat, visar programmet alltid en lista med "
-"öppna nycklar, där du kan välja vilken som ska användas för kryptering. Om det "
-"är avstängt, visar programmet bara dialogrutan om det inte hittar rätt nyckel, "
-"eller om det finns flera som skulle kunna användas.</p></qt>"
+"<qt><p>När det här alternativet är aktiverat, visar programmet alltid en "
+"lista med öppna nycklar, där du kan välja vilken som ska användas för "
+"kryptering. Om det är avstängt, visar programmet bara dialogrutan om det "
+"inte hittar rätt nyckel, eller om det finns flera som skulle kunna användas."
+"</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -513,12 +529,10 @@ msgstr "Kom ihåg val"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Om du markerar den här rutan lagras valet och du blir inte tillfrågad "
+"<qt><p>Om du markerar den här rutan lagras valet och du blir inte tillfrågad "
 "igen.</p></qt>"
 
 #: kpgpui.cpp:391
@@ -618,6 +632,10 @@ msgstr "Val av OpenPGP-nyckel"
 msgid "Please select an OpenPGP key to use."
 msgstr "Välj en OpenPGP-nyckel som ska användas."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Ändra..."
diff --git a/tde-i18n-ta/messages/tdepim/libkpgp.po b/tde-i18n-ta/messages/tdepim/libkpgp.po
index 40b6340540b..21f15bff947 100644
--- a/tde-i18n-ta/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ta/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2004-11-29 03:49-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,6 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -33,33 +45,33 @@ msgstr ""
 msgid "Out of memory."
 msgstr "நினைவு இல்லை."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 msgstr ""
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "பிஜிபி எச்சரிக்கை "
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&திரும்ப முயற்சி செய்"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "&கையொப்பமிடாததை அனுப்பு"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 #, fuzzy
 msgid ""
 "_: %1 = 'signing failed' error message\n"
@@ -70,28 +82,28 @@ msgstr ""
 "%1\n"
 "கையொப்பமிடாத செய்தியை அனுப்பவேண்டுமா, அல்லது செய்தியை ரத்து செய்யலாமா?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 #, fuzzy
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "_: %1 = 'தவறான விசைகள்' பிழைச் செய்தி\n"
 "%1\n"
-"எந்தவிதத்திலாவது மறையாக்கவேண்டுமா, அப்படியே விடவேண்டுமா, அல்ல்து செய்தி "
-"அனுப்புவதை ரத்து செய்ய வேண்டுமா?"
+"எந்தவிதத்திலாவது மறையாக்கவேண்டுமா, அப்படியே விடவேண்டுமா, அல்ல்து செய்தி அனுப்புவதை "
+"ரத்து செய்ய வேண்டுமா?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "மறையாக்கப்பட்டதை அனுப்பு"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "மறையாக்கப்படாததை அனுப்பு"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 #, fuzzy
 msgid ""
 "_: %1 = 'missing keys' error message\n"
@@ -102,12 +114,12 @@ msgstr ""
 "%1\n"
 "செய்தியை அப்படியே விடவேண்டுமா, அல்லது செய்தி அனுப்புவதை ரத்து செய்யவேண்டுமா?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 #, fuzzy
 msgid "&Send As-Is"
 msgstr "&அப்படியே அனுப்பு"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -116,7 +128,7 @@ msgstr ""
 "பின்வரும் பிழை நேர்ந்துள்ளது:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -124,35 +136,35 @@ msgstr ""
 "இது %1ன் பிழை செய்தி: \n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
-"இந்த செய்தி பெறுபவருக்கான மறையாக்க விசையை நீங்கள் தேர்ந்தெடுக்கவில்லை; இதனால் "
-"செய்தியை மறையாக்கமுடியாது."
+"இந்த செய்தி பெறுபவருக்கான மறையாக்க விசையை நீங்கள் தேர்ந்தெடுக்கவில்லை; இதனால் செய்தியை "
+"மறையாக்கமுடியாது."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"இந்த செய்தி பெறுபவர்கள் எவருக்குமே மறையாக்க விசையை நீங்கள் தேர்ந்தெடுக்கவில்லை; "
-"இதனால் செய்தியை மறையாக்கமுடியாது."
+"இந்த செய்தி பெறுபவர்கள் எவருக்குமே மறையாக்க விசையை நீங்கள் தேர்ந்தெடுக்கவில்லை; இதனால் "
+"செய்தியை மறையாக்கமுடியாது."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -160,16 +172,16 @@ msgstr ""
 "இந்த தன்மை\n"
 "இன்னும் காணப்படவில்லை"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "மறையாக்க விசை தேர்வு"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -178,7 +190,7 @@ msgid ""
 "Please re-select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -187,7 +199,7 @@ msgid ""
 "Select the key(s) which should be used for this recipient."
 msgstr ""
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -230,8 +242,8 @@ msgstr "தவறான சொற்றொடர்; நுழைய முட�
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 
 #: kpgpbase2.cpp:213
@@ -270,8 +282,8 @@ msgstr ""
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 
 #: kpgpbase5.cpp:157
@@ -318,7 +330,7 @@ msgstr "உங்கள் ரகசிய விசையை பயன்பட
 msgid "Error running gpg"
 msgstr "ஜிபிஜியை இயக்கும்போது பிழை"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (file ~/.gnupg/pubring.gpg இல்லை)"
 
@@ -332,6 +344,11 @@ msgid ""
 "\"%1\":"
 msgstr ""
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "பிஜிபி எச்சரிக்கை "
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
@@ -370,22 +387,25 @@ msgstr "பிஜிபி பதிப்பு 6.x"
 msgid "Do not use any encryption tool"
 msgstr "எந்த மறையாக்க கருவியையும் பயன்படுத்தவேண்டாம்"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr ""
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:174
@@ -394,11 +414,10 @@ msgstr ""
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:188
@@ -407,11 +426,10 @@ msgstr "உள்ளிட்டப் பிறகு &கையொப்பம
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
 
 #: kpgpui.cpp:200
@@ -420,11 +438,11 @@ msgstr ""
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
 
 #: kpgpui.cpp:327
@@ -445,13 +463,11 @@ msgstr "நினைவு தேர்வு"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>இந்த பெட்டி தேர்ந்தெடுக்கப்பட்டால் உங்கள் விருப்பம் சேகரிக்கப்படும் நீங்கள் "
-"திரும்பவும் கேட்கப்பட மாட்டீர்கள்.</p></qt>"
+"<qt><p>இந்த பெட்டி தேர்ந்தெடுக்கப்பட்டால் உங்கள் விருப்பம் சேகரிக்கப்படும் நீங்கள் திரும்பவும் "
+"கேட்கப்பட மாட்டீர்கள்.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -556,6 +572,10 @@ msgstr "ஓபன்பிஜிபி விசை தேர்வு"
 msgid "Please select an OpenPGP key to use."
 msgstr "பயன்படுத்த ஒரு ஓபன் பிஜிபி விசையை தேர்ந்தெடுக்கவும்."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "மாற்று..."
diff --git a/tde-i18n-tr/messages/tdepim/libkpgp.po b/tde-i18n-tr/messages/tdepim/libkpgp.po
index 2b660fe9a68..36d038cef58 100644
--- a/tde-i18n-tr/messages/tdepim/libkpgp.po
+++ b/tde-i18n-tr/messages/tdepim/libkpgp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-06-28 15:57+0300\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
@@ -18,6 +18,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -38,7 +50,7 @@ msgstr "Parola cümlesi çok uzun, 1024 harften az olmalı."
 msgid "Out of memory."
 msgstr "Bellek bitti."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -46,59 +58,59 @@ msgstr ""
 "Yanlış bir parola cümlesi girdiniz.\n"
 "Yeniden girmeyi mi yoksa iletiyi şifresi çözülmeden görmeyi mi istersiniz?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP Uyarısı"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Tekrar Dene"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Yanlış bir parola cümlesi girdiniz.\n"
-"Yeniden girmeyi mi, devam edip iletiyi imzalamadan göndermeyi mi, yoksa iletiyi "
-"göndermeyi iptal etmeyi mi istersiniz?"
+"Yeniden girmeyi mi, devam edip iletiyi imzalamadan göndermeyi mi, yoksa "
+"iletiyi göndermeyi iptal etmeyi mi istersiniz?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "İ&mzalamadan Gönder"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 msgstr ""
 "%1\n"
-"İletiyi imzalamadan göndermek mi istersiniz, iletiyi göndermekten vazgeçmek mi "
-"istersiniz?"
+"İletiyi imzalamadan göndermek mi istersiniz, iletiyi göndermekten vazgeçmek "
+"mi istersiniz?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
-"İletiyi olduğu gibi bırakıp şifrelemeyi mi yoksa gönderme işlemini iptal etmeyi "
-"mi istiyorsunuz?"
+"İletiyi olduğu gibi bırakıp şifrelemeyi mi yoksa gönderme işlemini iptal "
+"etmeyi mi istiyorsunuz?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "&Şifreli Gönder"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "&Açık Gönder"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -107,11 +119,11 @@ msgstr ""
 "%1\n"
 "İletiyi olduğu gibi bırakmayı mı yoksa göndermemeyi mi istiyorsunuz?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "Old&uğu Gibi Gönder"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -120,7 +132,7 @@ msgstr ""
 "Aşağıdaki hata oluştu:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -128,7 +140,7 @@ msgstr ""
 "Hata: %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -136,15 +148,15 @@ msgstr ""
 "Bu iletinin alıcısı için şifreleme anahtarı belirlemediniz; bu yüzden ileti "
 "şifrelenmeyecek."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 "Bu iletinin hiçbir alıcısı için şifreleme anahtarı belirlemediniz; bu yüzden "
 "ileti şifrelenmeyecek."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -152,15 +164,16 @@ msgstr ""
 "Bu iletinin alıcılarından biri için şifreleme anahtarı belirlemediniz; bu "
 "yüzden ilgili kişi şifreli gönderirseniz iletinin şifresini çözemeyecek."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Bu iletinin alıcılarından bazıları için şifreleme anahtarı belirlemediniz; bu "
-"yüzden ilgili kişiler şifreli gönderirseniz iletinin şifresini çözemeyecek."
+"Bu iletinin alıcılarından bazıları için şifreleme anahtarı belirlemediniz; "
+"bu yüzden ilgili kişiler şifreli gönderirseniz iletinin şifresini "
+"çözemeyecek."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -168,18 +181,18 @@ msgstr ""
 "Bu özellik\n"
 "halen eksiktir"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Sisteminizde GnuPG/PGP kururlu değil ya da GnuPG/PGP kullanmamayı tercih "
 "ettiniz."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Şifreleme Anahtarı Seçimi"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -191,7 +204,7 @@ msgstr ""
 "\n"
 "Lütfen bu alıcı için kullanılacak anahtar(lar)ı tekrar seçiniz."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -203,7 +216,7 @@ msgstr ""
 "\n"
 "Lütfen bu alıcı için kullanılacak anahtar(lar)ı tekrar seçiniz."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -252,7 +265,8 @@ msgid ""
 "%1;\n"
 "these persons will not be able to read the message."
 msgstr ""
-"Aşağıdaki kullanıcı(lar) için olan açık anahtar güvenilir imzayla onaylanmadı:\n"
+"Aşağıdaki kullanıcı(lar) için olan açık anahtar güvenilir imzayla "
+"onaylanmadı:\n"
 "%1\n"
 "Bu alıcılar iletiyi okuyamayacaklar."
 
@@ -262,11 +276,11 @@ msgstr "Yanlış parola cümlesi; imzalama başarısızlıkla sonuçlandı."
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
-"İmzalama başarısız: PGP Kullanıcı Kimliğinizi, PGP yapılandırmasını ve anahtar "
-"halkalarını denetleyiniz."
+"İmzalama başarısız: PGP Kullanıcı Kimliğinizi, PGP yapılandırmasını ve "
+"anahtar halkalarını denetleyiniz."
 
 #: kpgpbase2.cpp:213
 msgid "Encryption failed: please check your PGP setup and the key rings."
@@ -285,7 +299,8 @@ msgstr "Yanlış parola cümlesi: Şifre çözme başarısızlıkla sonuçlandı
 #: kpgpbase2.cpp:310 kpgpbase5.cpp:238 kpgpbaseG.cpp:278
 msgid "You do not have the secret key needed to decrypt this message."
 msgstr ""
-"Bu iletinin şifresini çözmek için gerekli olan gizli anahtara sahip değilsiniz."
+"Bu iletinin şifresini çözmek için gerekli olan gizli anahtara sahip "
+"değilsiniz."
 
 #: kpgpbase2.cpp:450
 msgid ""
@@ -309,8 +324,8 @@ msgstr "Girdiğiniz parola cümlesi geçersizdir."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "İletinizi şifrelemek için kullanmak istediğiniz anahtar(lar) güvenilir "
 "değiller. Hiçbir şifreleme yapılmadı."
@@ -364,7 +379,7 @@ msgstr ""
 msgid "Error running gpg"
 msgstr "GPG çalıştırma hatası"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (~/.gnupg/pubring.gpg dosyası bulunamadı)"
 
@@ -380,13 +395,18 @@ msgstr ""
 "\"%1\"\n"
 "için lütfen OpenPGP parola cümlenizi giriniz:"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP Uyarısı"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
-"Lütfen şifrelemenin ciddi olarak kullanmadan önce gerçekten çalıştığından emin "
-"olunuz. Ayrıca eklerin PGP/GPG ile şifrelenmediğini unutmayınız."
+"Lütfen şifrelemenin ciddi olarak kullanmadan önce gerçekten çalıştığından "
+"emin olunuz. Ayrıca eklerin PGP/GPG ile şifrelenmediğini unutmayınız."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -420,33 +440,35 @@ msgstr "PGP Sürüm 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Şifreleme yöntemi kullanma"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "Parola sözcüğünü aklında &tut"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Bu seçenek etkinleştirildiğinde, gizli anahtarınızın parola cümlesi uygulama "
-"çalıştığı sürece hatırlanacaktır. Bu yüzden, parola cümlenizi sadece bir kere "
-"belirtmeniz yeterlidir.</p>"
-"<p>Bunun bir güvenlik tehdidi yaratabileceğini göz önünde bulundurunuz. Eğer "
-"bilgisayarınızın başından ayrılırsanız, başkaları imzalı iletiler "
-"gönderebildiği gibi şifreli iletilerinizi de okuyabilir. Eğer bellek dökümü "
-"olursa, parola cümelenizle birlikte RAM'inizin içeriği diske yazılır.</p>"
-"<p>KMail kullanırken, bu yapılandırma sadece gpg-agent kulanmazken geçerlidir. "
-"Şifreleme eklentileri kullanırken, bu seçenek yine önemsenmez.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Bu seçenek etkinleştirildiğinde, gizli anahtarınızın parola cümlesi "
+"uygulama çalıştığı sürece hatırlanacaktır. Bu yüzden, parola cümlenizi "
+"sadece bir kere belirtmeniz yeterlidir.</p><p>Bunun bir güvenlik tehdidi "
+"yaratabileceğini göz önünde bulundurunuz. Eğer bilgisayarınızın başından "
+"ayrılırsanız, başkaları imzalı iletiler gönderebildiği gibi şifreli "
+"iletilerinizi de okuyabilir. Eğer bellek dökümü olursa, parola cümelenizle "
+"birlikte RAM'inizin içeriği diske yazılır.</p><p>KMail kullanırken, bu "
+"yapılandırma sadece gpg-agent kulanmazken geçerlidir. Şifreleme eklentileri "
+"kullanırken, bu seçenek yine önemsenmez.</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -454,16 +476,14 @@ msgstr "Her zaman &kendime şifrele"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bu seçenek etkinleştirildiğinde, ileti/dosya sadece karşı tarafın açık "
-"anahtarıyla değil, aynı zamanda Sizinkiyle de şifrelenecektir. Bu Size ileride "
-"ileti/dosya şifresinin çözebilme olasılığı sunar. Bu genelde iyi bir "
+"<qt><p>Bu seçenek etkinleştirildiğinde, ileti/dosya sadece karşı tarafın "
+"açık anahtarıyla değil, aynı zamanda Sizinkiyle de şifrelenecektir. Bu Size "
+"ileride ileti/dosya şifresinin çözebilme olasılığı sunar. Bu genelde iyi bir "
 "fikirdir.</p></qt>"
 
 #: kpgpui.cpp:188
@@ -472,16 +492,15 @@ msgstr "Yazdıktan sonra imzalı/şifreli metni &göster"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Bu seçenek etkinleştirildiğinde, imzalanan/şifrelenen metin, gönderilmeden "
-"önceki halini bilmeniz için ayrı bir pencerede görüntülenecektir. Bu şifreleme "
-"düzeneğinizi sınamak için iyi bir fikirdir.</p></qt>"
+"<qt><p>Bu seçenek etkinleştirildiğinde, imzalanan/şifrelenen metin, "
+"gönderilmeden önceki halini bilmeniz için ayrı bir pencerede "
+"görüntülenecektir. Bu şifreleme düzeneğinizi sınamak için iyi bir fikirdir.</"
+"p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -489,17 +508,17 @@ msgstr "Her zaman şifreleme anahtarlarını &onay için göster"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Bu seçenek etkinleştirildiğinde, uygulama şifreleme için kullanabileceğiniz "
-"anahtarların bir listesini onlardan birini seçmeniz için gösterir. Eğer etkin "
-"değilse; uygulama doğru anahtarı bulamazsa veya kullanılabileceği birden fazla "
-"anahtar varsa iletişim penceresi görüntüleyecektir.</p></qt>"
+"<qt><p>Bu seçenek etkinleştirildiğinde, uygulama şifreleme için "
+"kullanabileceğiniz anahtarların bir listesini onlardan birini seçmeniz için "
+"gösterir. Eğer etkin değilse; uygulama doğru anahtarı bulamazsa veya "
+"kullanılabileceği birden fazla anahtar varsa iletişim penceresi "
+"görüntüleyecektir.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -519,13 +538,11 @@ msgstr "Tercihleri hatırla"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Eğer bu kutuyu seçerseniz, seçiminiz hatırlanacak ve daha sonra size tekrar "
-"sorulmayacaktır.</p></qt>"
+"<qt><p>Eğer bu kutuyu seçerseniz, seçiminiz hatırlanacak ve daha sonra size "
+"tekrar sorulmayacaktır.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -624,6 +641,10 @@ msgstr "OpenPGP Anahtar Seçimi"
 msgid "Please select an OpenPGP key to use."
 msgstr "Lütfen kullanılacak OpenPGP anahtarını seçiniz."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Değiştir..."
diff --git a/tde-i18n-uk/messages/tdepim/libkpgp.po b/tde-i18n-uk/messages/tdepim/libkpgp.po
index fc4ac7456db..b1c8399fbb9 100644
--- a/tde-i18n-uk/messages/tdepim/libkpgp.po
+++ b/tde-i18n-uk/messages/tdepim/libkpgp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2007-03-24 18:59-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -16,8 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
 
 #: kpgp.cpp:187
 msgid ""
@@ -39,7 +51,7 @@ msgstr "Фраза пароля занадто довга, вона мусить
 msgid "Out of memory."
 msgstr "Недостатньо оперативної пам'яті."
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -48,30 +60,30 @@ msgstr ""
 "Хочете спробувати ще раз, чи скасувати та переглянути повідомлення не "
 "розшифрованим?"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "Попередження PGP"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "&Повторити спробу"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 msgstr ""
 "Ви ввели невірну фразу пароля.\n"
-"Хочете спробувати ще раз, продовжити та залишити повідомлення непідписаним, чи "
-"скасувати відсилання повідомлення?"
+"Хочете спробувати ще раз, продовжити та залишити повідомлення непідписаним, "
+"чи скасувати відсилання повідомлення?"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "Надіслати &без підпису"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -80,26 +92,26 @@ msgstr ""
 "%1\n"
 "Хочете надіслати повідомлення непідписаним чи скасувати його відсилання?"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "Хочете зашифрувати попри все, залишити повідомлення як є, чи скасувати "
 "відсилання повідомлення?"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "Надіслати &зашифроване"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "Надіслати &незашифроване"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -108,11 +120,11 @@ msgstr ""
 "%1\n"
 "Хочете залишити повідомлення як є чи скасувати відсилання повідомлення?"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "&Надіслати як є"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -121,7 +133,7 @@ msgstr ""
 "Виникла наступна помилка:\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -129,7 +141,7 @@ msgstr ""
 "Це повідомлення про помилку %1:\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -137,23 +149,23 @@ msgstr ""
 "Ви не вибрали ключ шифрування для адресата. Отже, повідомлення не буде "
 "зашифроване."
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
-"Ви не вибрали ключі шифрування для жодного адресата. Отже, повідомлення не буде "
-"зашифроване."
+"Ви не вибрали ключі шифрування для жодного адресата. Отже, повідомлення не "
+"буде зашифроване."
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
-"Ви не вибрали ключ шифрування для одного з адресатів. Він не зможе розшифрувати "
-"це повідомлення, якщо ви зашифруєте його."
+"Ви не вибрали ключ шифрування для одного з адресатів. Він не зможе "
+"розшифрувати це повідомлення, якщо ви зашифруєте його."
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -161,7 +173,7 @@ msgstr ""
 "Ви не вибрали ключ шифрування для деяких адресатів. Вони не зможуть "
 "розшифрувати це повідомлення, якщо ви зашифруєте його."
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
@@ -169,18 +181,18 @@ msgstr ""
 "Вибачте, але ця функція\n"
 "ще відсутня"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Або GnuPG/PGP не встановлено на вашому комп'ютері, або ви відмовились від "
 "застосування GnuPG/PGP."
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Вибір ключа для шифрування"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -190,9 +202,10 @@ msgid ""
 msgstr ""
 "Сталася помилка з ключем(ами) шифрування для \"%1\".\n"
 "\n"
-"Будь ласка, перевиберіть ключ(і), які будуть використанні для цього отримувача."
+"Будь ласка, перевиберіть ключ(і), які будуть використанні для цього "
+"отримувача."
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -204,7 +217,7 @@ msgstr ""
 "\n"
 "Виберіть ключі для цього адресата."
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -262,8 +275,8 @@ msgstr "Неправильна фраза пароля; неможливо пі�
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr ""
 "Неможливо підписати: будь ласка, перевірте ваш профіль користувача PGP, "
 "параметри PGP та набори ключів."
@@ -309,8 +322,8 @@ msgstr "Ви ввели неправильний пароль."
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr ""
 "Ключ(і), з якими ви хочете зашифрувати це повідомлення, не мають довіри. "
 "Шифрування не виконане."
@@ -362,7 +375,7 @@ msgstr "Підписування зазнало невдачі, тому що з
 msgid "Error running gpg"
 msgstr "Помилка запуску gpg"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "??? (файл ~/.gnupg/pubring.gpg не знайдено)"
 
@@ -378,14 +391,19 @@ msgstr ""
 "Будь ласка, введіть фразу пароля OpenPGP для\n"
 "\"%1\":"
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "Попередження PGP"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
 msgstr ""
 "Перевірте, будь ласка, чи шифрування дійсно працює, перед тим як "
-"використовувати його серйозно. Також пам'ятайте, що долучення не шифруються за "
-"допомогою модуля PGP/GPG."
+"використовувати його серйозно. Також пам'ятайте, що долучення не шифруються "
+"за допомогою модуля PGP/GPG."
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -419,35 +437,37 @@ msgstr "PGP версія 6.x"
 msgid "Do not use any encryption tool"
 msgstr "Не використовувати жодних засобів шифрування"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "&Зберігати фразу пароля у пам'яті"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Коли цей параметр увімкнено, програма запам'ятає фразу пароля вашого "
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
+msgstr ""
+"<qt><p>Коли цей параметр увімкнено, програма запам'ятає фразу пароля вашого "
 "закритого ключа, та цей пароль буде зберігатися в пам'яті поки програма "
-"виконується. Отже, вам буде потрібно ввести пароль всього один раз.</p>"
-"<p>Але пам'ятайте, що це може бути небезпечним. Якщо ви відійдете від "
+"виконується. Отже, вам буде потрібно ввести пароль всього один раз.</"
+"p><p>Але пам'ятайте, що це може бути небезпечним. Якщо ви відійдете від "
 "комп'ютера, всі інші матимуть можливість відсилати підписані вашим ключем "
-"повідомлення та читати зашифровані повідомлення, які було надіслано вам. Якщо "
-"виникне збій у програмі, то весь зміст пам'яті буде збережено на диск включаючи "
-"ваш пароль.</p>"
-"<p>Пам'ятайте, що при використанні KMail, значення цього параметра буде "
-"використано тільки, якщо ви не використовуєте gpg-agent. Також значення "
-"ігнорується при використанні втулків шифруванняns.</p></qt>"
+"повідомлення та читати зашифровані повідомлення, які було надіслано вам. "
+"Якщо виникне збій у програмі, то весь зміст пам'яті буде збережено на диск "
+"включаючи ваш пароль.</p><p>Пам'ятайте, що при використанні KMail, значення "
+"цього параметра буде використано тільки, якщо ви не використовуєте gpg-"
+"agent. Також значення ігнорується при використанні втулків шифруванняns.</"
+"p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -455,17 +475,15 @@ msgstr "Завжди зашифров&увати для себе"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Коли цей параметр увімкнено, повідомлення/файл буде зашифровано не тільки "
-"відкритим ключем адресата, а, також, і вашим ключем. Це дозволить вам "
-"розшифровувати та переглядати це повідомлення пізніше. Вмикання цього параметру "
-"- це гарна ідея.</p></qt>"
+"<qt><p>Коли цей параметр увімкнено, повідомлення/файл буде зашифровано не "
+"тільки відкритим ключем адресата, а, також, і вашим ключем. Це дозволить вам "
+"розшифровувати та переглядати це повідомлення пізніше. Вмикання цього "
+"параметру - це гарна ідея.</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -473,17 +491,15 @@ msgstr "&Показувати зашифрований/підписаний те
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Коли цей параметр увімкнено, підписаний/зашифрований текст буде показано в "
-"окремому вікні, що дозволить побачити у якому вигляді повідомлення буде "
-"відіслано. Вмикання цього параметру - це гарна ідея при перевірці роботи "
-"системи шифрування.</p></qt>"
+"<qt><p>Коли цей параметр увімкнено, підписаний/зашифрований текст буде "
+"показано в окремому вікні, що дозволить побачити у якому вигляді "
+"повідомлення буде відіслано. Вмикання цього параметру - це гарна ідея при "
+"перевірці роботи системи шифрування.</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -491,18 +507,17 @@ msgstr "Завжди показувати ключі шифрування &дл�
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>Коли цей параметр увімкнено, програма завжди буде відображати список наявних "
-"відкритих ключів, з якого ви зможете вибрати ключ, яким потрібно зашифрувати "
-"повідомлення. А коли цей параметр вимкнено, програма буде відображати цей "
-"список тільки тоді, коли не знайдено відповідного ключа або знайдено декілька "
-"відповідних ключів.</p></qt>"
+"<qt><p>Коли цей параметр увімкнено, програма завжди буде відображати список "
+"наявних відкритих ключів, з якого ви зможете вибрати ключ, яким потрібно "
+"зашифрувати повідомлення. А коли цей параметр вимкнено, програма буде "
+"відображати цей список тільки тоді, коли не знайдено відповідного ключа або "
+"знайдено декілька відповідних ключів.</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -522,13 +537,11 @@ msgstr "Запам'ятати вибір"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>Якщо цей параметр увімкнено, ваш вибір буде збережено та вас більше не "
-"будуть турбувати цим питанням знову.</p></qt>"
+"<qt><p>Якщо цей параметр увімкнено, ваш вибір буде збережено та вас більше "
+"не будуть турбувати цим питанням знову.</p></qt>"
 
 #: kpgpui.cpp:391
 msgid "&Reread Keys"
@@ -627,6 +640,10 @@ msgstr "Вибір ключа OpenPGP"
 msgid "Please select an OpenPGP key to use."
 msgstr "Виберіть, будь ласка, ключ OpenPGP."
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "Змінити..."
diff --git a/tde-i18n-zh_TW/messages/tdepim/libkpgp.po b/tde-i18n-zh_TW/messages/tdepim/libkpgp.po
index 0b5a67c7ec5..2e3c2eb69e2 100644
--- a/tde-i18n-zh_TW/messages/tdepim/libkpgp.po
+++ b/tde-i18n-zh_TW/messages/tdepim/libkpgp.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-15 18:01+0100\n"
 "PO-Revision-Date: 2006-06-15 08:15+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kpgp.cpp:187
 msgid ""
 "Could not find PGP executable.\n"
@@ -35,7 +47,7 @@ msgstr "密碼片語太長了。必須在 1024 個字元之內。"
 msgid "Out of memory."
 msgstr "記憶體不足。"
 
-#: kpgp.cpp:286
+#: kpgp.cpp:279
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -43,16 +55,16 @@ msgstr ""
 "您輸入了不正確的密碼片語。\n"
 "您要再試一次，還是取消解密的動作？"
 
-#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
-#: kpgp.cpp:589 kpgp.cpp:608
+#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
+#: kpgp.cpp:582 kpgp.cpp:601
 msgid "PGP Warning"
 msgstr "PGP 警告"
 
-#: kpgp.cpp:289 kpgp.cpp:349
+#: kpgp.cpp:282 kpgp.cpp:342
 msgid "&Retry"
 msgstr "重試(&R)"
 
-#: kpgp.cpp:343
+#: kpgp.cpp:336
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -61,11 +73,11 @@ msgstr ""
 "您輸入了不正確的密碼片語。\n"
 "您要再試一次，或是不簽署信件而繼續，還是取消不發送此信件了？"
 
-#: kpgp.cpp:350 kpgp.cpp:378
+#: kpgp.cpp:343 kpgp.cpp:371
 msgid "Send &Unsigned"
 msgstr "不簽署發送"
 
-#: kpgp.cpp:372
+#: kpgp.cpp:365
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -74,25 +86,25 @@ msgstr ""
 "%1\n"
 "您要不簽署而發送此信件，還是取消不發送此信件了？"
 
-#: kpgp.cpp:390
+#: kpgp.cpp:383
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
-"Do you want to encrypt anyway, leave the message as-is, or cancel sending the "
-"message?"
+"Do you want to encrypt anyway, leave the message as-is, or cancel sending "
+"the message?"
 msgstr ""
 "%1\n"
 "您要繼續做加密的動作，還是不加密，還是取消不發送此信件了？"
 
-#: kpgp.cpp:397 kpgp.cpp:609
+#: kpgp.cpp:390 kpgp.cpp:602
 msgid "Send &Encrypted"
 msgstr "繼續加密發送(&E)"
 
-#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
+#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
 msgid "Send &Unencrypted"
 msgstr "不加密發送(&U)"
 
-#: kpgp.cpp:417
+#: kpgp.cpp:410
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -101,11 +113,11 @@ msgstr ""
 "%1\n"
 "您決定直接發送此信件，還是取消不發送此信件？"
 
-#: kpgp.cpp:423
+#: kpgp.cpp:416
 msgid "&Send As-Is"
 msgstr "直接發送(&S)"
 
-#: kpgp.cpp:434
+#: kpgp.cpp:427
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -114,7 +126,7 @@ msgstr ""
 "發生以下的錯誤：\n"
 "%1"
 
-#: kpgp.cpp:436
+#: kpgp.cpp:429
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -122,46 +134,50 @@ msgstr ""
 "%1 的錯誤訊息為：\n"
 "%2"
 
-#: kpgp.cpp:581
+#: kpgp.cpp:574
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr "您沒有對此信件的收件者選擇加密金鑰，因此此信件將不會被加密。"
 
-#: kpgp.cpp:584
+#: kpgp.cpp:577
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr "您沒有對此信件的任一收件者選擇加密金鑰，因此此信件將不會被加密。"
 
-#: kpgp.cpp:600
+#: kpgp.cpp:593
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "您沒有對此信件的其中一位收件者選擇加密金鑰，因此如果您加密此信件的話，這位收件者可能無法解密。"
+msgstr ""
+"您沒有對此信件的其中一位收件者選擇加密金鑰，因此如果您加密此信件的話，這位收"
+"件者可能無法解密。"
 
-#: kpgp.cpp:603
+#: kpgp.cpp:596
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
-msgstr "您沒有對此信件的其中幾位收件者選擇加密金鑰，因此如果您加密此信件的話，這幾位收件者可能無法解密。"
+msgstr ""
+"您沒有對此信件的其中幾位收件者選擇加密金鑰，因此如果您加密此信件的話，這幾位"
+"收件者可能無法解密。"
 
-#: kpgp.cpp:877
+#: kpgp.cpp:857
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr "這功能尚未實作。"
 
-#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
+#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr "您可能沒有安裝 GnuPG/PGP，或是您選擇不要使用 GnuPG/PGP。"
 
-#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "選擇加密金鑰"
 
-#: kpgp.cpp:1215
+#: kpgp.cpp:1195
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -173,7 +189,7 @@ msgstr ""
 "\n"
 "請重新選擇適用於這位收件者的金鑰。"
 
-#: kpgp.cpp:1279
+#: kpgp.cpp:1259
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -185,7 +201,7 @@ msgstr ""
 "\n"
 "請重新選擇適用於這位收件者的金鑰。"
 
-#: kpgp.cpp:1305
+#: kpgp.cpp:1285
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -241,8 +257,8 @@ msgstr "錯誤的密碼片語。無法簽署。"
 
 #: kpgpbase2.cpp:205
 msgid ""
-"Signing failed: please check your PGP User Identity, the PGP setup, and the key "
-"rings."
+"Signing failed: please check your PGP User Identity, the PGP setup, and the "
+"key rings."
 msgstr "簽署失敗。請檢查您的 PGP 使用者身份，PGP 設定，及金鑰環。"
 
 #: kpgpbase2.cpp:213
@@ -283,8 +299,8 @@ msgstr "您輸入了錯誤的密碼片語。"
 
 #: kpgpbase5.cpp:154
 msgid ""
-"The key(s) you want to encrypt your message to are not trusted. No encryption "
-"done."
+"The key(s) you want to encrypt your message to are not trusted. No "
+"encryption done."
 msgstr "您要用來加密信件的金鑰未被信任。將不做加密。"
 
 #: kpgpbase5.cpp:157
@@ -334,7 +350,7 @@ msgstr "簽署失敗，因為您的秘密金鑰無法使用。"
 msgid "Error running gpg"
 msgstr "執行 GPG 錯誤。"
 
-#: kpgpbaseG.cpp:355
+#: kpgpbaseG.cpp:371
 msgid "??? (file ~/.gnupg/pubring.gpg not found)"
 msgstr "？？（找不到 ~/.gnupg/pubring.gpg 檔案）"
 
@@ -348,11 +364,18 @@ msgid ""
 "\"%1\":"
 msgstr "請輸入 %1 的 OpenPGP 密碼片語："
 
+#: kpgpui.cpp:117
+#, fuzzy
+msgid "Warning"
+msgstr "PGP 警告"
+
 #: kpgpui.cpp:121
 msgid ""
 "Please check if encryption really works before you start using it seriously. "
 "Also note that attachments are not encrypted by the PGP/GPG module."
-msgstr "在開始使用前，請認真檢查加密是否能運作。另外也請注意，附加檔並不會被 PGP/GPG 模組加密。"
+msgstr ""
+"在開始使用前，請認真檢查加密是否能運作。另外也請注意，附加檔並不會被 PGP/GPG "
+"模組加密。"
 
 #: kpgpui.cpp:134
 msgid "Encryption Tool"
@@ -386,28 +409,33 @@ msgstr "PGP 版本 6.x"
 msgid "Do not use any encryption tool"
 msgstr "不要使用任何加密工具"
 
+#: kpgpui.cpp:155
+msgid "Options"
+msgstr ""
+
 #: kpgpui.cpp:157
 msgid "&Keep passphrase in memory"
 msgstr "將密碼片語記在記憶體中(&K)"
 
 #: kpgpui.cpp:161
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the passphrase of your private key will be "
-"remembered by the application as long as the application is running. Thus you "
-"will only have to enter the passphrase once.</p>"
-"<p>Be aware that this could be a security risk. If you leave your computer, "
-"others can use it to send signed messages and/or read your encrypted messages. "
-"If a core dump occurs, the contents of your RAM will be saved onto disk, "
-"including your passphrase.</p>"
-"<p>Note that when using KMail, this setting only applies if you are not using "
-"gpg-agent. It is also ignored if you are using crypto plugins.</p></qt>"
+"<qt><p>When this option is enabled, the passphrase of your private key will "
+"be remembered by the application as long as the application is running. Thus "
+"you will only have to enter the passphrase once.</p><p>Be aware that this "
+"could be a security risk. If you leave your computer, others can use it to "
+"send signed messages and/or read your encrypted messages. If a core dump "
+"occurs, the contents of your RAM will be saved onto disk, including your "
+"passphrase.</p><p>Note that when using KMail, this setting only applies if "
+"you are not using gpg-agent. It is also ignored if you are using crypto "
+"plugins.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>開啟此選項的話，您私密金鑰使用的密碼片語被記憶起來，直到應用程式不再執行。這樣您只需要輸入一次密碼片語即可。</p> "
-"<p>但是要注意，這樣做有安全性上的風險。如果您離開您的電腦，其他人可能可以用您的電腦與您的金鑰來簽署與發送信件，或是用您的金鑰來解密並偷看別人的信件。如果程式"
-"出現錯誤而造成 core dumped，則記憶體內容會被記到檔案中，包括您的密碼片語在內。</p> "
-"<p>如果您是使用 KMail，這個設定只在您不使用 GPG 代理人時才有用。如果您使用加密外掛程式，這個設定也會被忽略。</p></qt>"
+"<qt><p>開啟此選項的話，您私密金鑰使用的密碼片語被記憶起來，直到應用程式不再執"
+"行。這樣您只需要輸入一次密碼片語即可。</p> <p>但是要注意，這樣做有安全性上的"
+"風險。如果您離開您的電腦，其他人可能可以用您的電腦與您的金鑰來簽署與發送信"
+"件，或是用您的金鑰來解密並偷看別人的信件。如果程式出現錯誤而造成 core "
+"dumped，則記憶體內容會被記到檔案中，包括您的密碼片語在內。</p> <p>如果您是使"
+"用 KMail，這個設定只在您不使用 GPG 代理人時才有用。如果您使用加密外掛程式，這"
+"個設定也會被忽略。</p></qt>"
 
 #: kpgpui.cpp:174
 msgid "Always encr&ypt to self"
@@ -415,15 +443,13 @@ msgstr "永遠對自己加密(&Y)"
 
 #: kpgpui.cpp:179
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the message/file will not only be "
+"encrypted with the receiver's public key, but also with your key. This will "
+"enable you to decrypt the message/file at a later time. This is generally a "
+"good idea.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>開啟此選項的話，信件或檔案不只使用收件人的公開金鑰加密，另外也會用您自己的金鑰加密。您自己稍後可以去解密此信件或檔案。通常這會是個好主意。</p>"
-"</qt>"
+"<qt><p>開啟此選項的話，信件或檔案不只使用收件人的公開金鑰加密，另外也會用您自"
+"己的金鑰加密。您自己稍後可以去解密此信件或檔案。通常這會是個好主意。</p></qt>"
 
 #: kpgpui.cpp:188
 msgid "&Show signed/encrypted text after composing"
@@ -431,15 +457,14 @@ msgstr "寫信時顯示簽署過/加密過的文字(&S)"
 
 #: kpgpui.cpp:194
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works.</p>"
-"</qt>"
+"<qt><p>When this option is enabled, the signed/encrypted text will be shown "
+"in a separate window, enabling you to know how it will look before it is "
+"sent. This is a good idea when you are verifying that your encryption system "
+"works.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>開啟此選項的話，您在寫信時會另外有一個視窗，顯示加密過或簽署過後的內容，讓您在發送前知道加密過或簽署過後是長什麼樣子。通常如果您要確認您的加密系統可以運作"
-"，就可以選擇此選項。</p></qt>"
+"<qt><p>開啟此選項的話，您在寫信時會另外有一個視窗，顯示加密過或簽署過後的內"
+"容，讓您在發送前知道加密過或簽署過後是長什麼樣子。通常如果您要確認您的加密系"
+"統可以運作，就可以選擇此選項。</p></qt>"
 
 #: kpgpui.cpp:200
 msgid "Always show the encryption keys &for approval"
@@ -447,15 +472,15 @@ msgstr "顯示加密金鑰清單以供選擇(&F)"
 
 #: kpgpui.cpp:205
 msgid ""
-"<qt>"
-"<p>When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used. </p></qt>"
+"<qt><p>When this option is enabled, the application will always show you a "
+"list of public keys from which you can choose the one it will use for "
+"encryption. If it is off, the application will only show the dialog if it "
+"cannot find the right key or if there are several which could be used. </p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>開啟此選項的話，應用程式會顯示一個公開金鑰的清單，您可以從中選擇一個金鑰用於加密。如果不開啟此選項，則應用程式只會在找不到正確的金鑰，或是有多個金鑰需要選"
-"擇時才會顯示視窗。</p></qt>"
+"<qt><p>開啟此選項的話，應用程式會顯示一個公開金鑰的清單，您可以從中選擇一個金"
+"鑰用於加密。如果不開啟此選項，則應用程式只會在找不到正確的金鑰，或是有多個金"
+"鑰需要選擇時才會顯示視窗。</p></qt>"
 
 #: kpgpui.cpp:327
 msgid "&Search for:"
@@ -475,9 +500,8 @@ msgstr "記住選擇"
 
 #: kpgpui.cpp:354
 msgid ""
-"<qt>"
-"<p>If you check this box your choice will be stored and you will not be asked "
-"again.</p></qt>"
+"<qt><p>If you check this box your choice will be stored and you will not be "
+"asked again.</p></qt>"
 msgstr "<qt><p>如果您開啟此選項，您的選擇會被記起來，不會再被詢問。</P></qt>"
 
 #: kpgpui.cpp:391
@@ -577,6 +601,10 @@ msgstr "選擇 OpenPGP 金鑰"
 msgid "Please select an OpenPGP key to use."
 msgstr "請選擇要使用的 OpenPGP 金鑰"
 
+#: kpgpui.cpp:1182
+msgid "Clear"
+msgstr ""
+
 #: kpgpui.cpp:1185 kpgpui.cpp:1378 kpgpui.cpp:1435
 msgid "Change..."
 msgstr "變更..."