summaryrefslogtreecommitdiffstats
path: root/tde-i18n-ss/messages/tdepim
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-29 03:08:03 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-29 03:08:03 -0500
commit242434109c14a494dee7738b9c343f5947d20506 (patch)
treeea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-ss/messages/tdepim
parent8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
downloadtde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz
tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip
Automated l10n update (.po files)
Diffstat (limited to 'tde-i18n-ss/messages/tdepim')
-rw-r--r--tde-i18n-ss/messages/tdepim/kmail.po5359
-rw-r--r--tde-i18n-ss/messages/tdepim/tdeio_imap4.po30
2 files changed, 3163 insertions, 2226 deletions
diff --git a/tde-i18n-ss/messages/tdepim/kmail.po b/tde-i18n-ss/messages/tdepim/kmail.po
index 06eb45f84ec..95e183abaa8 100644
--- a/tde-i18n-ss/messages/tdepim/kmail.po
+++ b/tde-i18n-ss/messages/tdepim/kmail.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
"PO-Revision-Date: 2002-11-10 00:41+0200\n"
"Last-Translator: Adam Mathebula <adam@translate.org.za>\n"
"Language-Team: Siswati <siswati@translate.org.za>\n"
+"Language: ss\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -96,7 +97,7 @@ msgstr ""
msgid "multiple encryption keys per address"
msgstr ""
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
#: mailinglistpropertiesdialog.cpp:97
msgid "KMail"
msgstr ""
@@ -139,7 +140,7 @@ msgid "Locking Method"
msgstr ""
#: accountdialog.cpp:368
-msgid "Procmail loc&kfile:"
+msgid "Procmail loc&tdefile:"
msgstr ""
#: accountdialog.cpp:380
@@ -193,7 +194,7 @@ msgid "Check inter&val:"
msgstr ""
#: accountdialog.cpp:438 accountdialog.cpp:537 accountdialog.cpp:741
-#: accountdialog.cpp:1059 configuredialog.cpp:2655
+#: accountdialog.cpp:1059 configuredialog.cpp:2733
msgid " min"
msgstr " min"
@@ -226,8 +227,8 @@ msgstr ""
msgid "Account Type: POP Account"
msgstr ""
-#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2526
-#: identitydialog.cpp:109 kmfilterdlg.cpp:160 kmtransport.cpp:376
+#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
+#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
msgid "&General"
msgstr ""
@@ -319,7 +320,7 @@ msgstr ""
msgid "Check &What the Server Supports"
msgstr ""
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
#: kmtransport.cpp:502
msgid "Encryption"
msgstr ""
@@ -442,7 +443,7 @@ msgid "Sho&w hidden folders"
msgstr ""
#: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+msgid "Show only serverside s&ubscribed folders"
msgstr ""
#: accountdialog.cpp:992
@@ -494,9 +495,9 @@ msgstr ""
msgid "<none>"
msgstr "<none>"
-#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:244
-#: kmfoldercachedimap.cpp:2085 kmfolderimap.cpp:204 kmfolderimap.cpp:907
-#: kmkernel.cpp:1374 subscriptiondialog.cpp:172
+#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
+#: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
+#: kmkernel.cpp:1424 subscriptiondialog.cpp:172
msgid "inbox"
msgstr ""
@@ -562,7 +563,7 @@ msgid ""
"the possibility to turn filtering messages on the server on."
msgstr ""
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
msgid ""
"_n: day\n"
" days"
@@ -600,36 +601,36 @@ msgstr ""
msgid "Edit Namespace '%1'"
msgstr ""
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
#, c-format
msgid "Account %1"
msgstr ""
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
msgid ""
"Account %1 has no mailbox defined:\n"
"mail checking aborted;\n"
"check your account settings."
msgstr ""
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
msgid "Checking account %1 for new mail"
msgstr ""
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
#: accountwizard.cpp:477
msgid "Local Account"
msgstr ""
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
msgid "POP Account"
msgstr ""
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
msgid "IMAP Account"
msgstr ""
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
msgid ""
"You need to add an account in the network section of the settings in order to "
"receive mail."
@@ -735,13 +736,13 @@ msgstr ""
msgid "Server Information"
msgstr ""
-#. i18n: file customtemplates_base.ui line 248
-#: accountwizard.cpp:329 rc.cpp:212
+#. i18n: file customtemplates_base.ui line 302
+#: accountwizard.cpp:329 rc.cpp:221
#, fuzzy, no-c-format
msgid "None"
msgstr "<none>"
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
msgid "Sendmail"
msgstr ""
@@ -749,13 +750,13 @@ msgstr ""
msgid "Check for supported security capabilities of %1..."
msgstr ""
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
-#: kmfiltermgr.cpp:293
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
+#: kmfiltermgr.cpp:291
msgid "<b>Evaluating filter rules:</b> "
msgstr ""
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:159 kmfiltermgr.cpp:262
-#: kmfiltermgr.cpp:299
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
+#: kmfiltermgr.cpp:297
msgid "<b>Filter rules have matched.</b>"
msgstr ""
@@ -764,111 +765,111 @@ msgstr ""
msgid "<b>Applying filter action:</b> %1"
msgstr ""
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
msgid "Anti-Spam Wizard"
msgstr ""
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
msgid "Anti-Virus Wizard"
msgstr ""
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
msgid "Welcome to the KMail Anti-Spam Wizard"
msgstr ""
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
msgid "Welcome to the KMail Anti-Virus Wizard"
msgstr ""
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
msgid "Options to fine-tune the handling of spam messages"
msgstr ""
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
msgid "Options to fine-tune the handling of virus messages"
msgstr ""
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
msgid "Summary of changes to be made by this wizard"
msgstr ""
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
msgid "Virus handling"
msgstr ""
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
msgid "Spam handling"
msgstr ""
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
msgid "Semi spam (unsure) handling"
msgstr ""
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
msgid "Classify as spam"
msgstr ""
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
msgid "Classify as NOT spam"
msgstr ""
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
msgid "Scanning for %1..."
msgstr ""
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
msgid "Scanning for anti-spam tools finished."
msgstr ""
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
msgid "Scanning for anti-virus tools finished."
msgstr ""
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
msgid ""
"<p>No spam detection tools have been found. Install your spam detection "
"software and re-run this wizard.</p>"
msgstr ""
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
msgid "Scanning complete. No anti-virus tools found."
msgstr ""
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
msgid "<p>Messages classified as spam are marked as read."
msgstr ""
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
msgid "<p>Messages classified as spam are not marked as read."
msgstr ""
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
msgid "<br>Spam messages are moved into the folder named <i>"
msgstr ""
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
msgid "<br>Spam messages are not moved into a certain folder.</p>"
msgstr ""
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
msgstr ""
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
msgid "<p>The wizard will create the following filters:<ul>"
msgstr ""
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
msgid "<p>The wizard will replace the following filters:<ul>"
msgstr ""
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
msgid ""
"The wizard will search for any tools to do spam detection\n"
"and setup KMail to work with them."
msgstr ""
-#: antispamwizard.cpp:864
+#: antispamwizard.cpp:868
msgid ""
"<p>Here you can get some assistance in setting up KMail's filter rules to use "
"some commonly-known anti-virus tools.</p>"
@@ -883,35 +884,35 @@ msgid ""
"former behavior."
msgstr ""
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
msgid ""
"<p>Please select the tools to be used for the detection and go to the next "
"page.</p>"
msgstr ""
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
msgid "&Mark detected spam messages as read"
msgstr ""
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
msgid "Mark messages which have been classified as spam as read."
msgstr ""
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
msgid "Move &known spam to:"
msgstr ""
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
msgid ""
"The default folder for spam messages is the trash folder, but you may change "
"that in the folder view below."
msgstr ""
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
msgid "Move &probable spam to:"
msgstr ""
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
msgid ""
"The default folder is the inbox folder, but you may change that in the folder "
"view below."
@@ -919,11 +920,11 @@ msgid ""
"capable tool, you can't select a folder as well."
msgstr ""
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
msgid "Check messages using the anti-virus tools"
msgstr ""
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
msgid ""
"Let the anti-virus tools check your messages. The wizard will create "
"appropriate filters. The messages are usually marked by the tools so that "
@@ -931,28 +932,164 @@ msgid ""
"special folder."
msgstr ""
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
msgid "Move detected viral messages to the selected folder"
msgstr ""
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
msgid ""
"A filter to detect messages classified as virus-infected and to move those "
"messages into a predefined folder is created. The default folder is the trash "
"folder, but you may change that in the folder view."
msgstr ""
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
msgid "Additionally, mark detected viral messages as read"
msgstr ""
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
msgid ""
"Mark messages which have been classified as virus-infected as read, as well as "
"moving them to the selected folder."
msgstr ""
-#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:825
+#: archivefolderdialog.cpp:48
+msgid ""
+"_: Start of the filename for a mail archive file\n"
+"Archive"
+msgstr ""
+
+#: archivefolderdialog.cpp:53
+msgid "Archive Folder"
+msgstr ""
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+msgid "&Folder:"
+msgstr ""
+
+#: archivefolderdialog.cpp:80
+msgid "F&ormat:"
+msgstr ""
+
+#: archivefolderdialog.cpp:86
+msgid "Compressed Zip Archive (.zip)"
+msgstr ""
+
+#: archivefolderdialog.cpp:87
+msgid "Uncompressed Archive (.tar)"
+msgstr ""
+
+#: archivefolderdialog.cpp:88
+msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+msgstr ""
+
+#: archivefolderdialog.cpp:89
+msgid "GZ-Compressed Tar Archive (.tar.gz)"
+msgstr ""
+
+#: archivefolderdialog.cpp:96 importarchivedialog.cpp:61
+msgid "&Archive File:"
+msgstr ""
+
+#: archivefolderdialog.cpp:111
+msgid "&Delete folders after completion"
+msgstr ""
+
+#: archivefolderdialog.cpp:161
+msgid "Please select the folder that should be archived."
+msgstr ""
+
+#: archivefolderdialog.cpp:162
+msgid "No folder selected"
+msgstr ""
+
+#: backupjob.cpp:123 importjob.cpp:89
+msgid "The operation was canceled by the user."
+msgstr ""
+
+#: backupjob.cpp:151
+msgid "Failed to archive the folder '%1'."
+msgstr ""
+
+#: backupjob.cpp:153
+msgid "Archiving failed."
+msgstr ""
+
+#: backupjob.cpp:163
+msgid "Unable to finalize the archive file."
+msgstr ""
+
+#: backupjob.cpp:168
+msgid "Archiving finished"
+msgstr ""
+
+#: backupjob.cpp:173
+msgid ""
+"Archiving folder '%1' successfully completed. The archive was written to the "
+"file '%2'."
+msgstr ""
+
+#: backupjob.cpp:177
+msgid ""
+"_n: 1 message of size %1 was archived.\n"
+"%n messages with the total size of %1 were archived."
+msgstr ""
+
+#: backupjob.cpp:179
+#, c-format
+msgid "The archive file has a size of %1."
+msgstr ""
+
+#: backupjob.cpp:181
+msgid "Archiving finished."
+msgstr ""
+
+#: backupjob.cpp:216 backupjob.cpp:226
+msgid "Unable to retrieve a message for folder '%1'."
+msgstr ""
+
+#: backupjob.cpp:251
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr ""
+
+#: backupjob.cpp:321
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr ""
+
+#: backupjob.cpp:360
+msgid "Downloading a message in folder '%1' failed."
+msgstr ""
+
+#: backupjob.cpp:362
+msgid "Downloading a message in the current folder failed."
+msgstr ""
+
+#: backupjob.cpp:391
+#, c-format
+msgid "Archiving folder %1"
+msgstr ""
+
+#: backupjob.cpp:393 importjob.cpp:210
+msgid "Unable to open folder '%1'."
+msgstr ""
+
+#: backupjob.cpp:413
+msgid "Unable to create folder structure for folder '%1' within archive file."
+msgstr ""
+
+#: backupjob.cpp:425
+msgid "Unable to backup messages in folder '%1', the index file is corrupted."
+msgstr ""
+
+#: backupjob.cpp:483
+msgid "Unable to open archive for writing."
+msgstr ""
+
+#: backupjob.cpp:489
+msgid "Archiving"
+msgstr ""
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
msgid "Error while deleting messages on the server: "
msgstr ""
@@ -960,47 +1097,95 @@ msgstr ""
msgid "Error while retrieving message on the server: "
msgstr ""
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
msgid "Error while uploading folder"
msgstr ""
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
msgid "Could not make the folder <b>%1</b> on the server."
msgstr ""
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
msgid ""
"This could be because you do not have permission to do this, or because the "
"folder is already present on the server; the error message from the server "
"communication is here:"
msgstr ""
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
msgid "Error while deleting folder %1 on the server: "
msgstr ""
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
msgid "Error while reading folder %1 on the server: "
msgstr ""
-#: cachedimapjob.cpp:794
+#: cachedimapjob.cpp:811
+msgid ""
+"Error while trying to subscribe to the renamed folder %1.\n"
+"Renaming itself was successful, but the renamed folder might disappear from the "
+"folder list after the next sync since it is unsubscribed on the server.\n"
+"You can try to manually subscribe to the folder yourself.\n"
+"\n"
+"%2"
+msgstr ""
+
+#: cachedimapjob.cpp:857
#, c-format
msgid "Error while trying to rename folder %1"
msgstr ""
-#: callback.cpp:170
+#: callback.cpp:71
+msgid ""
+"<qt>The receiver of this invitation doesn't match any of your identities."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:74
+msgid ""
+"<qt>The identity matching the receiver of this invitation doesn't have an "
+"associated transport configured."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:78
+msgid "Select Transport"
+msgstr ""
+
+#: callback.cpp:97
+#, c-format
+msgid "Declined: %1"
+msgstr ""
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, c-format
+msgid "Accepted: %1"
+msgstr ""
+
+#: callback.cpp:103
+#, c-format
+msgid "Delegated: %1"
+msgstr ""
+
+#: callback.cpp:216
msgid ""
"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any:"
+"<br>please choose which of the following addresses is yours, if any, or select "
+"one of your identities to use in the reply:"
msgstr ""
-#: callback.cpp:176
+#: callback.cpp:222
msgid ""
"<qt>Several of your identities match the receiver of this message,"
"<br>please choose which of the following addresses is yours:"
msgstr ""
-#: callback.cpp:183
+#: callback.cpp:233
msgid "Select Address"
msgstr ""
@@ -1025,178 +1210,178 @@ msgstr ""
msgid "Error occurred while compacting \"%1\". Compaction aborted."
msgstr ""
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
msgid ""
"<qt>"
"<p>This setting has been fixed by your administrator.</p>"
"<p>If you think this is an error, please contact him.</p></qt>"
msgstr ""
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
msgid "&Load Profile..."
msgstr ""
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
msgid "&Add..."
msgstr ""
-#: configuredialog.cpp:306 configuredialog.cpp:625 configuredialog.cpp:1096
-#: configuredialog.cpp:3165 simplestringlisteditor.cpp:108
+#: configuredialog.cpp:309 configuredialog.cpp:628 configuredialog.cpp:1102
+#: configuredialog.cpp:3278 simplestringlisteditor.cpp:108
msgid "&Modify..."
msgstr ""
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
msgid "&Rename"
msgstr ""
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
msgid "Remo&ve"
msgstr ""
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
msgid "Set as &Default"
msgstr ""
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
msgstr ""
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
msgid "Remove Identity"
msgstr ""
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
msgid "Add..."
msgstr ""
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
msgid "Modify..."
msgstr ""
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
msgid "Set as Default"
msgstr ""
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
msgid "&Receiving"
msgstr ""
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
msgid "&Sending"
msgstr ""
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
msgid "Outgoing accounts (add at least one):"
msgstr ""
-#. i18n: file customtemplates_base.ui line 99
-#: configuredialog.cpp:604 configuredialog.cpp:1074 configuredialog.cpp:3290
-#: distributionlistdialog.cpp:115 favoritefolderview.cpp:378
-#: kmcomposewin.cpp:366 rc.cpp:191 recipientspicker.cpp:389
+#. i18n: file customtemplates_base.ui line 89
+#: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
+#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
+#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
#, no-c-format
msgid "Name"
msgstr ""
-#. i18n: file customtemplates_base.ui line 88
-#: configuredialog.cpp:605 configuredialog.cpp:1075 kmcomposewin.cpp:369
-#: kmfilterdlg.cpp:214 kmmimeparttree.cpp:65 rc.cpp:188
+#. i18n: file customtemplates_base.ui line 78
+#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
+#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
#, no-c-format
msgid "Type"
msgstr ""
-#: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
-#: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
+#: configuredialog.cpp:621 configuredialog.cpp:1095 configuredialog.cpp:2949
+#: configuredialog.cpp:3200 configuredialog.cpp:3277 configuredialog.cpp:3611
msgid "A&dd..."
msgstr ""
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
msgid "R&emove"
msgstr ""
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
msgid "Set Default"
msgstr ""
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
msgid "Common Options"
msgstr ""
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
#, no-c-format
msgid "Confirm &before send"
msgstr ""
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
msgid "Never Automatically"
msgstr ""
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
msgid "On Manual Mail Checks"
msgstr ""
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
msgid "On All Mail Checks"
msgstr ""
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
msgid "Send Now"
msgstr ""
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
msgid "Send Later"
msgstr ""
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
msgid "Allow 8-bit"
msgstr ""
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
msgid "MIME Compliant (Quoted Printable)"
msgstr ""
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
msgid "Send &messages in outbox folder:"
msgstr ""
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
msgid "Defa&ult send method:"
msgstr ""
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
msgid "Message &property:"
msgstr ""
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
msgid "Defaul&t domain:"
msgstr ""
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
msgid ""
"<qt>"
"<p>The default domain is used to complete email addresses that only consist of "
"the user's name.</p></qt>"
msgstr ""
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
msgid ""
"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
"%1 %2"
msgstr ""
-#: configuredialog.cpp:766 configuredialog.cpp:943 configuredialog.cpp:991
+#: configuredialog.cpp:769 configuredialog.cpp:950 configuredialog.cpp:997
msgid "smtp (Default)"
msgstr ""
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
msgid "sendmail (Default)"
msgstr ""
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
msgid "Add Transport"
msgstr ""
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
msgid ""
"_: %1: type of transport. Result used in Configure->Accounts->"
"Sending listview, \"type\" column, first row, to indicate that this is the "
@@ -1204,395 +1389,387 @@ msgid ""
"%1 (Default)"
msgstr ""
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
msgid "Modify Transport"
msgstr ""
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
#, c-format
msgid ""
"_n: This identity has been changed to use the modified transport:\n"
"These %n identities have been changed to use the modified transport:"
msgstr ""
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
#, c-format
msgid ""
"_n: This identity has been changed to use the default transport:\n"
"These %n identities have been changed to use the default transport:"
msgstr ""
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
msgid "Incoming accounts (add at least one):"
msgstr ""
-#: configuredialog.cpp:1076 kmfolderseldlg.cpp:95 kmfoldertree.cpp:376
-#: searchwindow.cpp:230
+#: configuredialog.cpp:1082 kmfoldertree.cpp:397 searchwindow.cpp:229
+#: simplefoldertree.h:141
msgid "Folder"
msgstr ""
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
msgid "Chec&k mail on startup"
msgstr ""
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
msgid "New Mail Notification"
msgstr ""
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
msgid "&Beep"
msgstr ""
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
msgid "Deta&iled new mail notification"
msgstr ""
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
msgid "Show for each folder the number of newly arrived messages"
msgstr ""
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
msgid "Other Actio&ns"
msgstr ""
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
msgid "Unknown account type selected"
msgstr ""
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
msgid "Unable to create account"
msgstr ""
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
msgid "Add Account"
msgstr ""
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
msgid "Unable to locate account"
msgstr ""
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
msgid "Modify Account"
msgstr ""
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
msgstr ""
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
msgid "Color&s"
msgstr ""
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
msgid "La&yout"
msgstr ""
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
msgid "M&essage List"
msgstr ""
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
msgid "Message W&indow"
msgstr ""
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
msgid "System &Tray"
msgstr ""
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
msgid "Message Body"
msgstr ""
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
msgid "Message List"
msgstr ""
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
msgid "Message List - New Messages"
msgstr ""
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
msgid "Message List - Unread Messages"
msgstr ""
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
msgid "Message List - Important Messages"
msgstr ""
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
msgid "Message List - Todo Messages"
msgstr ""
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
msgid "Message List - Date Field"
msgstr ""
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
msgid "Folder List"
msgstr ""
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
msgid "Quoted Text - First Level"
msgstr ""
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
msgid "Quoted Text - Second Level"
msgstr ""
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
msgid "Quoted Text - Third Level"
msgstr ""
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
msgid "Fixed Width Font"
msgstr ""
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
msgid "Composer"
msgstr ""
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
msgid "Printing Output"
msgstr ""
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
msgid "&Use custom fonts"
msgstr ""
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
msgid "Apply &to:"
msgstr ""
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
msgid "Composer Background"
msgstr ""
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
msgid "Alternative Background Color"
msgstr ""
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
msgid "Normal Text"
msgstr ""
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
msgid "Link"
msgstr ""
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
msgid "Followed Link"
msgstr ""
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
msgid "Misspelled Words"
msgstr ""
#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
#, no-c-format
msgid "New Message"
msgstr ""
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
msgid "Unread Message"
msgstr ""
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
msgid "Important Message"
msgstr ""
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
msgid "Todo Message"
msgstr ""
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
msgid "OpenPGP Message - Encrypted"
msgstr ""
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
msgid "OpenPGP Message - Valid Signature with Trusted Key"
msgstr ""
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
msgid "OpenPGP Message - Valid Signature with Untrusted Key"
msgstr ""
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
msgid "OpenPGP Message - Unchecked Signature"
msgstr ""
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
msgid "OpenPGP Message - Bad Signature"
msgstr ""
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
msgid "Border Around Warning Prepending HTML Messages"
msgstr ""
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
msgid "Folder Name and Size When Close to Quota"
msgstr ""
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
msgid "HTML Status Bar Background - No HTML Message"
msgstr ""
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
msgid "HTML Status Bar Foreground - No HTML Message"
msgstr ""
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
msgid "HTML Status Bar Background - HTML Message"
msgstr ""
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
msgid "HTML Status Bar Foreground - HTML Message"
msgstr ""
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
msgid "&Use custom colors"
msgstr ""
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
msgid "Recycle colors on deep &quoting"
msgstr ""
-#: configuredialog.cpp:1757
+#: configuredialog.cpp:1763
msgid "Close to quota threshold"
msgstr ""
-#: configuredialog.cpp:1763
+#: configuredialog.cpp:1770
#, c-format
msgid "%"
msgstr ""
-#: configuredialog.cpp:1855
+#: configuredialog.cpp:1864
msgid "Lon&g folder list"
msgstr ""
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
msgid "Shor&t folder list"
msgstr ""
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
msgid "Abo&ve the message pane"
msgstr ""
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
msgid "&Below the message pane"
msgstr ""
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
msgid "Message Structure Viewer Placement"
msgstr ""
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
msgid "Show &never"
msgstr ""
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
msgid "Show only for non-plaintext &messages"
msgstr ""
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
msgid "Show alway&s"
msgstr ""
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
msgid "Message Structure Viewer"
msgstr ""
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
msgid "&Do not show a message preview pane"
msgstr ""
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
msgid "Show the message preview pane belo&w the message list"
msgstr ""
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
msgid "Show the message preview pane ne&xt to the message list"
msgstr ""
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
msgid "Message Preview Pane"
msgstr ""
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
msgid "Show favorite folder view"
msgstr ""
-#: configuredialog.cpp:1912
-msgid "Show folder quick search field"
-msgstr ""
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
msgid "Sta&ndard format (%1)"
msgstr ""
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
msgid "Locali&zed format (%1)"
msgstr ""
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
msgid "Fancy for&mat (%1)"
msgstr ""
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
msgid "C&ustom format (Shift+F1 for help):"
msgstr ""
-#: configuredialog.cpp:2003
-msgid "General Options"
-msgstr ""
-
#: configuredialog.cpp:2006
-msgid "Show Quick Search"
+msgid "General Options"
msgstr ""
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
msgid "Display messa&ge sizes"
msgstr ""
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
msgid "Show crypto &icons"
msgstr ""
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
msgid "Show attachment icon"
msgstr ""
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
msgid "&Threaded message list"
msgstr ""
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
msgid "Threaded Message List Options"
msgstr ""
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
msgid "Always &keep threads open"
msgstr ""
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
msgid "Threads default to o&pen"
msgstr ""
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
msgid "Threads default to closed"
msgstr ""
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
msgid ""
"Open threads that contain ne&w, unread or important messages and open watched "
"threads."
msgstr ""
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
msgid "Date Display"
msgstr ""
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
msgid ""
"<qt>"
"<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1625,113 +1802,159 @@ msgid ""
"<p><strong>All other input characters will be ignored.</strong></p></qt>"
msgstr ""
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
msgid ""
"Changing the global threading setting will override all folder specific values."
msgstr ""
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
msgid "Show HTML stat&us bar"
msgstr ""
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
msgid "Show s&pam status in fancy headers"
msgstr ""
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
#, no-c-format
msgid "Replace smileys by emoticons"
msgstr ""
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
msgid "Use smaller font for quoted text"
msgstr ""
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
#, no-c-format
msgid "Show expand/collapse quote marks"
msgstr ""
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2245
+msgid "Show current sender time"
+msgstr ""
+
+#: configuredialog.cpp:2262
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
+msgstr ""
+
+#: configuredialog.cpp:2328
msgid "Fallback ch&aracter encoding:"
msgstr ""
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
msgid "Auto"
msgstr ""
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
msgid "&Override character encoding:"
msgstr ""
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
#, no-c-format
msgid "Enable system tray icon"
msgstr ""
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
msgid "System Tray Mode"
msgstr ""
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
msgid "Always show KMail in system tray"
msgstr ""
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
msgid "Only show KMail in system tray if there are unread messages"
msgstr ""
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
msgid "&Templates"
msgstr ""
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
msgid "&Custom Templates"
msgstr ""
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
msgid "&Subject"
msgstr ""
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
msgid "Cha&rset"
msgstr ""
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
msgid "H&eaders"
msgstr ""
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
msgid ""
"_: Config->Composer->Attachments\n"
"A&ttachments"
msgstr ""
-#: configuredialog.cpp:2654
+#: configuredialog.cpp:2633
+msgid ""
+"When replying, add quote signs in front of all lines of the quoted text,\n"
+"even when the line was created by adding an additional linebreak while\n"
+"word-wrapping the text."
+msgstr ""
+
+#: configuredialog.cpp:2643
+msgid ""
+"When replying, only quote the selected text instead of the complete message "
+"when there is text selected in the message window."
+msgstr ""
+
+#: configuredialog.cpp:2704
+msgid "Warn if too many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2716
+msgid "Warn if more than this many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2732
msgid "No autosave"
msgstr ""
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+msgid "Default Forwarding Type:"
+msgstr ""
+
+#: configuredialog.cpp:2744
+msgid "Inline"
+msgstr ""
+
+#: configuredialog.cpp:2745
+msgid "As Attachment"
+msgstr ""
+
+#: configuredialog.cpp:2753
msgid "Configure Completion Order"
msgstr ""
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
msgid "Edit Recent Addresses..."
msgstr ""
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
msgid "External Editor"
msgstr ""
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
#, c-format
msgid "<b>%f</b> will be replaced with the filename to edit."
msgstr ""
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
msgid ""
"<qt>The following placeholders are supported in the reply phrases:"
"<br><b>%D</b>: date, <b>%S</b>: subject,"
@@ -1742,160 +1965,160 @@ msgid ""
"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
msgstr ""
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
msgid "Lang&uage:"
msgstr ""
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
msgid "Re&move"
msgstr ""
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
msgid "Reply to se&nder:"
msgstr ""
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
msgid "Repl&y to all:"
msgstr ""
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
msgid "&Forward:"
msgstr ""
#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
#, no-c-format
msgid "&Quote indicator:"
msgstr ""
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
msgid "On %D, you wrote:"
msgstr ""
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
msgid "On %D, %F wrote:"
msgstr ""
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
msgid "Forwarded Message"
msgstr ""
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
msgid ">%_"
msgstr ""
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
msgid "Repl&y Subject Prefixes"
msgstr ""
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
msgid ""
"Recognize any sequence of the following prefixes\n"
"(entries are case-insensitive regular expressions):"
msgstr ""
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
msgid "Mod&ify..."
msgstr ""
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
msgid "Enter new reply prefix:"
msgstr ""
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
msgid "For&ward Subject Prefixes"
msgstr ""
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
msgid "Enter new forward prefix:"
msgstr ""
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
msgid ""
"This list is checked for every outgoing message from the top to the bottom for "
"a charset that contains all required characters."
msgstr ""
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
msgid "Enter charset:"
msgstr ""
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
msgid "&Keep original charset when replying or forwarding (if possible)"
msgstr ""
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
msgid "This charset is not supported."
msgstr ""
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
msgid "&Use custom message-id suffix"
msgstr ""
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
msgid "Custom message-&id suffix:"
msgstr ""
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
msgid "Define custom mime header fields:"
msgstr ""
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
msgid "Value"
msgstr ""
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
msgid "Ne&w"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3312 kmfolderdia.cpp:268 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:76 rc.cpp:224
-#: rc.cpp:399
+#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
+#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
+#: rc.cpp:405
#, no-c-format
msgid "&Name:"
msgstr ""
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
msgid "&Value:"
msgstr ""
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
#, no-c-format
msgid "Outlook-compatible attachment naming"
msgstr ""
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
msgid ""
"Turn this option on to make Outlook(tm) understand attachment names containing "
"non-English characters"
msgstr ""
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
msgid "E&nable detection of missing attachments"
msgstr ""
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
msgid "Recognize any of the following key words as intention to attach a file:"
msgstr ""
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
msgid "Enter new key word:"
msgstr ""
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
msgid "attachment"
msgstr ""
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
msgid "attached"
msgstr ""
-#: configuredialog.cpp:3542
+#: configuredialog.cpp:3655
msgid ""
"You have chosen to encode attachment names containing non-English characters in "
"a way that is understood by Outlook(tm) and other mail clients that do not "
@@ -1906,27 +2129,27 @@ msgid ""
"option."
msgstr ""
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
msgid "&Reading"
msgstr ""
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
msgid "Composing"
msgstr ""
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
msgid "Warnings"
msgstr ""
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
msgid "S/MIME &Validation"
msgstr ""
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
msgid "Crypto Backe&nds"
msgstr ""
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
msgid ""
"<qt>"
"<p>Messages sometimes come in both formats. This option controls whether you "
@@ -1944,7 +2167,7 @@ msgid ""
"Folder</i> menu of KMail's main window.</p></qt>"
msgstr ""
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
msgid ""
"<qt>"
"<p>Some mail advertisements are in HTML and contain references to, for example, "
@@ -1959,7 +2182,7 @@ msgid ""
"possible problem.</p></qt>"
msgstr ""
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
msgid ""
"<qt>"
"<h3>Message Disposition Notification Policy</h3>"
@@ -1986,19 +2209,19 @@ msgid ""
"customer relationship management, it has been made available.</li></ul></qt>"
msgstr ""
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
msgid "HTML Messages"
msgstr ""
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
msgid "Prefer H&TML to plain text"
msgstr ""
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
msgid "Allow messages to load e&xternal references from the Internet"
msgstr ""
-#: configuredialog.cpp:3699
+#: configuredialog.cpp:3812
msgid ""
"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
"will be compromised by present and anticipated security exploits. <a "
@@ -2006,190 +2229,202 @@ msgid ""
"More about external references...</a>"
msgstr ""
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
msgid "Encrypted Messages"
msgstr ""
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
msgid "Attempt decryption of encrypted messages when viewing"
msgstr ""
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
msgid "Message Disposition Notifications"
msgstr ""
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
msgid "Send policy:"
msgstr ""
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
msgid "&Ignore"
msgstr ""
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
msgid "As&k"
msgstr ""
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
msgid "&Deny"
msgstr ""
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
msgid "Al&ways send"
msgstr ""
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
msgid "Quote original message:"
msgstr ""
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
msgid "Nothin&g"
msgstr ""
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
msgid "&Full message"
msgstr ""
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
msgid "Onl&y headers"
msgstr ""
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
msgid "Do not send MDNs in response to encrypted messages"
msgstr ""
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
msgid ""
"<b>WARNING:</b> Unconditionally returning confirmations undermines your "
"privacy. <a href=\"whatsthis:%1\">More...</a>"
msgstr ""
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
msgid "Certificate && Key Bundle Attachments"
msgstr ""
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
msgid "Automatically import keys and certificates"
msgstr ""
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
msgid ""
"Changing the global HTML setting will override all folder specific values."
msgstr ""
-#: configuredialog.cpp:4138
+#: configuredialog.cpp:4251
msgid "This option requires dirmngr >= 0.9.0"
msgstr ""
#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
#, no-c-format
msgid "no proxy"
msgstr ""
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
msgid "(Current system setting: %1)"
msgstr ""
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
msgid "&Folders"
msgstr ""
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
msgid "&Groupware"
msgstr ""
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
msgid ""
"_: Corresponds to Folder->Move All Messages to Trash\n"
"Ask for co&nfirmation before moving all messages to trash"
msgstr ""
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
msgid "E&xclude important messages from expiry"
msgstr ""
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
msgid ""
"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
"in all folders\".\n"
"When trying to find unread messages:"
msgstr ""
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
msgid ""
"_: continuation of \"When trying to find unread messages:\"\n"
"Do not Loop"
msgstr ""
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
msgid ""
"_: continuation of \"When trying to find unread messages:\"\n"
"Loop in Current Folder"
msgstr ""
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
msgid ""
"_: continuation of \"When trying to find unread messages:\"\n"
"Loop in All Folders"
msgstr ""
-#: configuredialog.cpp:4487
+#: configuredialog.cpp:4600
msgid ""
"_: to be continued with \"jump to first new message\", \"jump to first unread "
"or new message\",and \"jump to last selected message\".\n"
"When entering a folder:"
msgstr ""
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
msgid ""
"_: continuation of \"When entering a folder:\"\n"
"Jump to First New Message"
msgstr ""
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
msgid ""
"_: continuation of \"When entering a folder:\"\n"
"Jump to First Unread or New Message"
msgstr ""
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
msgid ""
"_: continuation of \"When entering a folder:\"\n"
"Jump to Last Selected Message"
msgstr ""
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr ""
+
+#: configuredialog.cpp:4611
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr ""
+
+#: configuredialog.cpp:4618
msgid "Mar&k selected message as read after"
msgstr ""
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
msgid " sec"
msgstr ""
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
msgid "Ask for action after &dragging messages to another folder"
msgstr ""
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
msgid ""
"_: to be continued with \"flat files\" and \"directories\", resp.\n"
"By default, &message folders on disk are:"
msgstr ""
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
msgid ""
"_: continuation of \"By default, &message folders on disk are\"\n"
"Flat Files (\"mbox\" format)"
msgstr ""
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
msgid ""
"_: continuation of \"By default, &message folders on disk are\"\n"
"Directories (\"maildir\" format)"
msgstr ""
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
msgid ""
"_: what's this help\n"
"<qt>"
@@ -2204,35 +2439,35 @@ msgid ""
"</qt>"
msgstr ""
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
msgid "Open this folder on startup:"
msgstr ""
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
msgid "Empty local &trash folder on program exit"
msgstr ""
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
msgid "Enable full text &indexing"
msgstr ""
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
msgid "Quota units: "
msgstr ""
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
msgid "KB"
msgstr ""
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
msgid "MB"
msgstr ""
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
msgid "GB"
msgstr ""
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
msgid ""
"_: what's this help\n"
"<qt>"
@@ -2250,7 +2485,7 @@ msgid ""
"depending on which option is selected.</p></qt>"
msgstr ""
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
msgid ""
"_: what's this help\n"
"<qt>"
@@ -2263,148 +2498,157 @@ msgid ""
"KMail while this operation is running.</p></qt>"
msgstr ""
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
msgid "&IMAP Resource Folder Options"
msgstr ""
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
msgid "&Enable IMAP resource functionality"
msgstr ""
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
msgid "This enables the IMAP storage for the Kontact applications"
msgstr ""
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
msgid "&Format used for the groupware folders:"
msgstr ""
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
msgid ""
"Choose the format to use to store the contents of the groupware folders."
msgstr ""
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
msgstr ""
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+msgid "Kolab2 (XML)"
msgstr ""
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
msgid "&Language of the groupware folders:"
msgstr ""
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
msgid "Set the language of the folder names"
msgstr ""
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
msgid "English"
msgstr ""
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
msgid "German"
msgstr ""
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
msgid "French"
msgstr ""
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
msgid "Dutch"
msgstr ""
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
msgid "Set the parent of the resource folders"
msgstr ""
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
msgid "&Hide groupware folders"
msgstr ""
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
msgid ""
"When this is checked, you will not see the IMAP resource folders in the folder "
"tree."
msgstr ""
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
msgid "&Only show groupware folders for this account"
msgstr ""
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
msgid ""
"When this is checked, you will not see normal mail folders in the folder tree "
"for the account configured for groupware."
msgstr ""
-#: configuredialog.cpp:4804
+#: configuredialog.cpp:4921
msgid "Synchronize groupware changes immediately"
msgstr ""
-#: configuredialog.cpp:4806
+#: configuredialog.cpp:4923
msgid ""
"Synchronize groupware changes in disconnected IMAP folders immediately when "
"being online."
msgstr ""
-#: configuredialog.cpp:4818
+#: configuredialog.cpp:4935
msgid "Groupware Compatibility && Legacy Options"
msgstr ""
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
msgid "&Enable groupware functionality"
msgstr ""
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
msgid "Mangle From:/To: headers in replies to invitations"
msgstr ""
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
msgid ""
"Turn this option on in order to make Outlook(tm) understand your answers to "
"invitation replies"
msgstr ""
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
msgid "Send invitations in the mail body"
msgstr ""
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
msgid ""
"Turn this option on in order to make Outlook(tm) understand your answers to "
"invitations"
msgstr ""
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
msgid "Exchange compatible invitation naming"
msgstr ""
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
+#: configuredialog.cpp:4964
+msgid ""
+"Outlook(tm), when used in combination with a Microsoft Exchange server,\n"
+"has a problem understanding standards-compliant groupware e-mail.\n"
+"Turn this option on to send groupware invitations and replies in an Exchange "
+"compatible way."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 190
+#: configuredialog.cpp:4970 rc.cpp:694
#, no-c-format
+msgid "Outlook compatible invitation reply comments"
+msgstr ""
+
+#: configuredialog.cpp:4971
msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
msgstr ""
-#. i18n: file kmail.kcfg line 188
-#: configuredialog.cpp:4853 rc.cpp:688
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
#, no-c-format
msgid "Automatic invitation sending"
msgstr ""
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
msgid ""
"When this is on, the user will not see the mail composer window. Invitation "
"mails are sent automatically"
msgstr ""
-#: configuredialog.cpp:4867
+#: configuredialog.cpp:4991
msgid ""
"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
"the invitation mails to be sent in the text of the mail instead; this is "
@@ -2416,15 +2660,15 @@ msgid ""
"be able to work with this.</qt>"
msgstr ""
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
msgid "<Choose a Folder>"
msgstr ""
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
msgid "&Resource folders are subfolders of:"
msgstr ""
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
msgid "&Resource folders are in account:"
msgstr ""
@@ -2492,31 +2736,31 @@ msgid ""
"Not available"
msgstr ""
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
msgid ""
"_: Message->\n"
"Universal"
msgstr ""
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
msgid ""
"_: Message->\n"
"Reply"
msgstr ""
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
msgid ""
"_: Message->\n"
"Reply to All"
msgstr ""
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
msgid ""
"_: Message->\n"
"Forward"
msgstr ""
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
msgid ""
"<qt>"
"<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2531,207 +2775,228 @@ msgid ""
"to <i>Universal</i> templates.</p></qt>"
msgstr ""
-#: customtemplates.cpp:107 templatesconfiguration.cpp:105
+#: customtemplates.cpp:120 templatesconfiguration.cpp:105
msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
msgstr ""
-#: customtemplates.cpp:137
+#: customtemplates.cpp:122
+msgid "Additional recipients of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:124
+msgid ""
+"When using this template for forwarding, the default recipients are those you "
+"enter here. This is a comma-separated list of mail addresses."
+msgstr ""
+
+#: customtemplates.cpp:125
+msgid ""
+"When using this template for forwarding, the recipients you enter here will by "
+"default get a copy of this message. This is a comma-separated list of mail "
+"addresses."
+msgstr ""
+
+#: customtemplates.cpp:186
msgid ""
"_: Message->\n"
"Unknown"
msgstr ""
-#: customtemplates.cpp:347 customtemplates.cpp:364
+#: customtemplates.cpp:420 customtemplates.cpp:437
msgid "Key Conflict"
msgstr ""
-#: customtemplates.cpp:348
+#: customtemplates.cpp:421
msgid ""
"The selected shortcut is already used for another custom template, would you "
"still like to continue with the assignment?"
msgstr ""
-#: customtemplates.cpp:365
+#: customtemplates.cpp:438
msgid ""
"The selected shortcut is already used, would you still like to continue with "
"the assignment?"
msgstr ""
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
msgid "Save Distribution List"
msgstr ""
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
msgid "Save List"
msgstr ""
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
msgid "Name:"
msgstr ""
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
msgid "Email"
msgstr ""
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
msgid ""
"There are no recipients in your list. First select some recipients, then try "
"again."
msgstr ""
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
msgid "New Distribution List"
msgstr ""
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
msgid "Please enter name:"
msgstr ""
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
msgid ""
"<qt>Distribution list with the given name <b>%1</b> already exists. Please "
"select a different name.</qt>"
msgstr ""
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
msgid "Edit with:"
msgstr ""
-#: editorwatcher.cpp:169
+#: editorwatcher.cpp:161
msgid ""
-"KMail is unable to detect when the choosen editor is closed. To avoid data "
-"loss, editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
+"editing the attachment will be aborted."
msgstr ""
-#: editorwatcher.cpp:170
+#: editorwatcher.cpp:163
msgid "Unable to edit attachment"
msgstr ""
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
msgid ""
"_: @item Text character set\n"
"Unicode"
msgstr ""
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
msgid ""
"_: @item Text character set\n"
"Cyrillic"
msgstr ""
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
msgid ""
"_: @item Text character set\n"
"Western European"
msgstr ""
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
msgid ""
"_: @item Text character set\n"
"Central European"
msgstr ""
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
msgid ""
"_: @item Text character set\n"
"Greek"
msgstr ""
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
msgid ""
"_: @item Text character set\n"
"Hebrew"
msgstr ""
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
msgid ""
"_: @item Text character set\n"
"Turkish"
msgstr ""
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
msgid ""
"_: @item Text character set\n"
"Japanese"
msgstr ""
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
msgid ""
"_: @item Text character set\n"
"Baltic"
msgstr ""
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
msgid ""
"_: @item Text character set\n"
"Arabic"
msgstr ""
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
msgid ""
"_: @item Text character set\n"
"Chinese Traditional"
msgstr ""
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
msgid ""
"_: @item Text character set\n"
"Chinese Simplified"
msgstr ""
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
msgid ""
"_: @item Text character set\n"
"Korean"
msgstr ""
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
msgid ""
"_: @item Text character set\n"
"Thai"
msgstr ""
-#: expirejob.cpp:164
+#: expirejob.cpp:177
msgid ""
"_n: Removing 1 old message from folder %1...\n"
"Removing %n old messages from folder %1..."
msgstr ""
-#: expirejob.cpp:171
+#: expirejob.cpp:184
msgid "Cannot expire messages from folder %1: destination folder %2 not found"
msgstr ""
-#: expirejob.cpp:186
+#: expirejob.cpp:199
msgid ""
"_n: Moving 1 old message from folder %1 to folder %2...\n"
"Moving %n old messages from folder %1 to folder %2..."
msgstr ""
-#: expirejob.cpp:214
+#: expirejob.cpp:227
msgid ""
"_n: Removed 1 old message from folder %1.\n"
"Removed %n old messages from folder %1."
msgstr ""
-#: expirejob.cpp:220
+#: expirejob.cpp:233
msgid ""
"_n: Moved 1 old message from folder %1 to folder %2.\n"
"Moved %n old messages from folder %1 to folder %2."
msgstr ""
-#: expirejob.cpp:227
+#: expirejob.cpp:240
msgid "Removing old messages from folder %1 failed."
msgstr ""
-#: expirejob.cpp:231
+#: expirejob.cpp:244
msgid "Moving old messages from folder %1 to folder %2 failed."
msgstr ""
-#: expirejob.cpp:237
+#: expirejob.cpp:250
msgid "Removing old messages from folder %1 was canceled."
msgstr ""
-#: expirejob.cpp:241
+#: expirejob.cpp:254
msgid "Moving old messages from folder %1 to folder %2 was canceled."
msgstr ""
@@ -2768,78 +3033,92 @@ msgid ""
"Note: Expiry action will be applied immediately after confirming settings."
msgstr ""
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
msgid "Please select a folder to expire messages into."
msgstr ""
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
msgid "No Folder Selected"
msgstr ""
-#: favoritefolderview.cpp:90
-msgid "Favorite Folders"
+#: expirypropertiesdialog.cpp:176
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
msgstr ""
-#: favoritefolderview.cpp:326
-msgid "Remove From Favorites"
+#: expirypropertiesdialog.cpp:178
+msgid "Wrong Folder Selected"
msgstr ""
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
-msgid "Rename Favorite"
+#: favoritefolderview.cpp:90
+msgid "Favorite Folders"
msgstr ""
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
msgid "&Assign Shortcut..."
msgstr ""
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
msgid "Expire..."
msgstr ""
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:342
+msgid "Remove From Favorites"
+msgstr ""
+
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
+msgid "Rename Favorite"
+msgstr ""
+
+#: favoritefolderview.cpp:347
msgid "Add Favorite Folder..."
msgstr ""
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
msgid "Local Inbox"
msgstr ""
-#: favoritefolderview.cpp:397
+#: favoritefolderview.cpp:408
#, c-format
msgid "Inbox of %1"
msgstr ""
-#: favoritefolderview.cpp:401
+#: favoritefolderview.cpp:412
msgid "%1 on %2"
msgstr ""
-#: favoritefolderview.cpp:403
+#: favoritefolderview.cpp:414
msgid "%1 (local)"
msgstr ""
-#: favoritefolderview.cpp:443
+#: favoritefolderview.cpp:454
msgid "Add Favorite Folder"
msgstr ""
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
msgid "Select Filters"
msgstr ""
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
msgid "Filters"
msgstr ""
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+msgid "Unselect All"
+msgstr ""
+
+#: filterimporterexporter.cpp:213
msgid "Import Filters"
msgstr ""
-#: filterimporterexporter.cpp:189
+#: filterimporterexporter.cpp:220
msgid ""
"The selected file is not readable. Your file access permissions might be "
"insufficient."
msgstr ""
-#: filterimporterexporter.cpp:204
+#: filterimporterexporter.cpp:235
msgid "Export Filters"
msgstr ""
@@ -2907,8 +3186,8 @@ msgid ""
"\"%2\" is the detailed error description."
msgstr ""
-#: filterlogdlg.cpp:262 kmcommands.cpp:2706 kmcommands.cpp:2730
-#: kmmainwidget.cpp:1795 kmmainwidget.cpp:1812 urlhandlermanager.cpp:489
+#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
msgid "KMail Error"
msgstr ""
@@ -2953,76 +3232,91 @@ msgid ""
"account on the server will tell you which one it is."
msgstr ""
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr ""
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
msgid "Permissions"
msgstr ""
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
msgid "Custom Permissions"
msgstr ""
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
msgid "Custom Permissions (%1)"
msgstr ""
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
msgid "User Id"
msgstr ""
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
msgid "Add Entry..."
msgstr ""
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
msgid "Modify Entry..."
msgstr ""
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
msgid "Remove Entry"
msgstr ""
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
msgid "Error retrieving user permissions."
msgstr ""
-#: folderdiaacltab.cpp:431
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+#: folderdiaacltab.cpp:430
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:435
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
msgstr ""
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
msgid "Error: no IMAP account defined for this folder"
msgstr ""
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
msgid "Connecting to server %1, please wait..."
msgstr ""
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
#, c-format
msgid "Error connecting to server %1"
msgstr ""
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
msgid "This IMAP server does not have support for access control lists (ACL)"
msgstr ""
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
#, c-format
msgid ""
"Error retrieving access control list (ACL) from server\n"
"%1"
msgstr ""
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
msgid "Modify Permissions"
msgstr ""
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
msgid "Add Permissions"
msgstr ""
-#: folderdiaacltab.cpp:631
+#: folderdiaacltab.cpp:636
msgid ""
"Do you really want to remove your own permissions for this folder? You will not "
"be able to access it afterwards."
@@ -3055,8 +3349,8 @@ msgstr ""
msgid "Select Folder"
msgstr ""
-#: folderrequester.cpp:95 kmcommands.cpp:1831 kmfoldermgr.cpp:45
-#: kmfoldertree.cpp:552
+#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: kmfoldertree.cpp:576
msgid "Local Folders"
msgstr ""
@@ -3084,7 +3378,7 @@ msgid ""
"this folder.</qt>"
msgstr ""
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
msgid "The selected shortcut is already used, please select a different one."
msgstr ""
@@ -3100,13 +3394,20 @@ msgstr ""
msgid "C&ancel"
msgstr ""
-#: headeritem.cpp:157 headeritem.cpp:164
+#: folderutil.cpp:93
+msgid ""
+"<qt>The folder you deleted was associated with the account <b>%1</b> "
+"which delivered mail into it. The folder the account delivers new mail into was "
+"reset to the main Inbox folder.</qt>"
+msgstr ""
+
+#: headeritem.cpp:179 headeritem.cpp:186
msgid "Unknown"
msgstr ""
-#: headeritem.cpp:171 headerstyle.cpp:140 headerstyle.cpp:238
-#: headerstyle.cpp:442 headerstyle.cpp:625 headerstyle.cpp:778
-#: kmmainwidget.cpp:1057
+#: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
+#: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
+#: kmmainwidget.cpp:1029
msgid "No Subject"
msgstr ""
@@ -3124,46 +3425,46 @@ msgstr ""
msgid "Stat&us:"
msgstr ""
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
msgid "Any Status"
msgstr ""
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
msgid "Open Full Search"
msgstr ""
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
msgid "[vCard]"
msgstr ""
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
msgid "CC: "
msgstr ""
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
msgid "BCC: "
msgstr ""
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
msgid "Date: "
msgstr ""
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
msgid "From: "
msgstr ""
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
msgid "To: "
msgstr ""
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
msgid "Reply to: "
msgstr ""
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
msgid ""
"%1% probability of being spam.\n"
"\n"
@@ -3171,23 +3472,43 @@ msgid ""
"%2"
msgstr ""
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
msgid "Launch IM"
msgstr ""
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+msgid "Morning"
+msgstr ""
+
+#: headerstyle.cpp:678
+msgid "Afternoon"
+msgstr ""
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+msgid "Sender's Current Time:"
+msgstr ""
+
+#: headerstyle.cpp:760
msgid "(resent from %1)"
msgstr ""
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
msgid "User-Agent: "
msgstr ""
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
msgid "X-Mailer: "
msgstr ""
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
msgid "Spam Status:"
msgstr ""
@@ -3228,15 +3549,15 @@ msgid ""
"<br>e</qt>"
msgstr ""
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
msgid "Edit Identity"
msgstr ""
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
msgid "&Your name:"
msgstr ""
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
msgid ""
"<qt>"
"<h3>Your name</h3>"
@@ -3246,11 +3567,11 @@ msgid ""
"address.</p></qt>"
msgstr ""
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
msgid "Organi&zation:"
msgstr ""
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
msgid ""
"<qt>"
"<h3>Organization</h3>"
@@ -3259,38 +3580,64 @@ msgid ""
"<p>It is safe (and normal) to leave this blank.</p></qt>"
msgstr ""
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
msgid "&Email address:"
msgstr ""
-#: identitydialog.cpp:149
+#: identitydialog.cpp:151
msgid ""
"<qt>"
"<h3>Email address</h3>"
-"<p>This field should have your full email address.</p>"
+"<p>This field should have your full email address</p>"
+"<p>This address is the primary one, used for all outgoing mail. If you have "
+"more than one address, either create a new identity, or add additional alias "
+"addresses in the field below.</p>"
"<p>If you leave this blank, or get it wrong, people will have trouble replying "
"to you.</p></qt>"
msgstr ""
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+msgid "Email a&liases:"
+msgstr ""
+
+#: identitydialog.cpp:167
+msgid ""
+"<qt>"
+"<h3>Email aliases</h3>"
+"<p>This field contains alias addresses that should also be considered as "
+"belonging to this identity (as opposed to representing a different "
+"identity).</p>"
+"<p>Example:</p>"
+"<table>"
+"<tr>"
+"<th>Primary address:</th>"
+"<td>first.last@example.org</td></tr>"
+"<tr>"
+"<th>Aliases:</th>"
+"<td>first@example.org"
+"<br>last@example.org</td></tr></table>"
+"<p>Type one alias address per line.</p></qt>"
+msgstr ""
+
+#: identitydialog.cpp:185
msgid "Cryptograph&y"
msgstr ""
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
msgid "Chang&e..."
msgstr ""
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
msgid "Your OpenPGP Signature Key"
msgstr ""
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
msgid ""
"Select the OpenPGP key which should be used to digitally sign your messages."
msgstr ""
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
msgid ""
"<qt>"
"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
@@ -3300,21 +3647,21 @@ msgid ""
"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
msgstr ""
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
msgid "OpenPGP signing key:"
msgstr ""
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
msgid "Your OpenPGP Encryption Key"
msgstr ""
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
msgid ""
"Select the OpenPGP key which should be used when encrypting to yourself and for "
"the \"Attach My Public Key\" feature in the composer."
msgstr ""
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
msgid ""
"<qt>"
"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
@@ -3326,21 +3673,21 @@ msgid ""
"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
msgstr ""
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
msgid "OpenPGP encryption key:"
msgstr ""
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
msgid "Your S/MIME Signature Certificate"
msgstr ""
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
msgid ""
"Select the S/MIME certificate which should be used to digitally sign your "
"messages."
msgstr ""
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
msgid ""
"<qt>"
"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
@@ -3349,21 +3696,21 @@ msgid ""
"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
msgstr ""
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
msgid "S/MIME signing certificate:"
msgstr ""
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
msgid "Your S/MIME Encryption Certificate"
msgstr ""
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
msgid ""
"Select the S/MIME certificate which should be used when encrypting to yourself "
"and for the \"Attach My Certificate\" feature in the composer."
msgstr ""
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
msgid ""
"<qt>"
"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
@@ -3373,23 +3720,23 @@ msgid ""
"affected.</p></qt>"
msgstr ""
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
msgid "S/MIME encryption certificate:"
msgstr ""
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
msgid "Preferred crypto message format:"
msgstr ""
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
msgid "&Advanced"
msgstr ""
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
msgid "&Reply-To address:"
msgstr ""
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
msgid ""
"<qt>"
"<h3>Reply-To addresses</h3>"
@@ -3401,11 +3748,11 @@ msgid ""
"<p>If in doubt, leave this field blank.</p></qt>"
msgstr ""
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
msgid "&BCC addresses:"
msgstr ""
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
msgid ""
"<qt>"
"<h3>BCC (Blind Carbon Copy) addresses</h3>"
@@ -3418,47 +3765,51 @@ msgid ""
"<p>If in doubt, leave this field blank.</p></qt>"
msgstr ""
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
msgid "D&ictionary:"
msgstr ""
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
msgid "Sent-mail &folder:"
msgstr ""
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
msgid "&Drafts folder:"
msgstr ""
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
msgid "&Templates folder:"
msgstr ""
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
msgid "Special &transport:"
msgstr ""
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
msgid "&Use custom message templates"
msgstr ""
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
msgid "&Copy global templates"
msgstr ""
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
msgid "&Signature"
msgstr ""
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
msgid "&Picture"
msgstr ""
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
msgid "Invalid Email Address"
msgstr ""
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+msgid "Invalid Email Alias \"%1\""
+msgstr ""
+
+#: identitydialog.cpp:551
msgid ""
"One of the configured OpenPGP signing keys does not contain any user ID with "
"the configured email address for this identity (%1).\n"
@@ -3466,13 +3817,13 @@ msgid ""
"verify signatures made with this configuration."
msgstr ""
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
msgid ""
"One of the configured OpenPGP encryption keys does not contain any user ID with "
"the configured email address for this identity (%1)."
msgstr ""
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
msgid ""
"One of the configured S/MIME signing certificates does not contain the "
"configured email address for this identity (%1).\n"
@@ -3480,37 +3831,37 @@ msgid ""
"verify signatures made with this configuration."
msgstr ""
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
msgid ""
"One of the configured S/MIME encryption certificates does not contain the "
"configured email address for this identity (%1)."
msgstr ""
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
msgid "Email Address Not Found in Key/Certificates"
msgstr ""
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
msgid "The signature file is not valid"
msgstr ""
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
msgid "Edit Identity \"%1\""
msgstr ""
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
msgid ""
"The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
"therefore, the default sent-mail folder will be used."
msgstr ""
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
msgid ""
"The custom drafts folder for identity \"%1\" does not exist (anymore); "
"therefore, the default drafts folder will be used."
msgstr ""
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
msgid ""
"The custom templates folder for identity \"%1\" does not exist (anymore); "
"therefore, the default templates folder will be used."
@@ -3531,110 +3882,110 @@ msgstr ""
msgid "Email Address"
msgstr ""
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
msgid "You need to supply a username and a password to access this mailbox."
msgstr ""
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
msgid "Authorization Dialog"
msgstr ""
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
msgid "Account:"
msgstr ""
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
#, c-format
msgid "Could not start process for %1."
msgstr ""
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
msgid "Error while trying to subscribe to %1:"
msgstr ""
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
msgid "Retrieving Namespaces"
msgstr ""
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
msgid ""
"KMail has detected a prefix entry in the configuration of the account \"%1\" "
"which is obsolete with the support of IMAP namespaces."
msgstr ""
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
msgid ""
"The configuration was automatically migrated but you should check your account "
"configuration."
msgstr ""
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
msgid ""
"It was not possible to migrate your configuration automatically so please check "
"your account configuration."
msgstr ""
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
#, fuzzy
msgid "<unknown>"
msgstr "<none>"
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
msgid "Error while uploading message"
msgstr ""
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
msgid ""
"Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
"to the server."
msgstr ""
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
msgid "The destination folder was: <b>%1</b>."
msgstr ""
-#: imapaccountbase.cpp:882
+#: imapaccountbase.cpp:890
msgid "The server reported:"
msgstr ""
-#: imapaccountbase.cpp:892
+#: imapaccountbase.cpp:900
msgid "No detailed quota information available."
msgstr ""
-#: imapaccountbase.cpp:903
+#: imapaccountbase.cpp:911
msgid "The folder is too close to its quota limit. (%1)"
msgstr ""
-#: imapaccountbase.cpp:905
+#: imapaccountbase.cpp:913
msgid ""
"\n"
"Since you do not have write privileges on this folder, please ask the owner of "
"the folder to free up some space in it."
msgstr ""
-#: imapaccountbase.cpp:951
+#: imapaccountbase.cpp:959
msgid ""
"The connection to the server %1 was unexpectedly closed or timed out. It will "
"be re-established automatically if possible."
msgstr ""
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
msgid "The connection to account %1 was broken."
msgstr ""
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
msgid "The connection to account %1 timed out."
msgstr ""
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
msgid "Error while uploading status of messages to server: "
msgstr ""
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
msgid "retrieving folders"
msgstr ""
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
msgid "Uploading message data"
msgstr ""
@@ -3658,45 +4009,275 @@ msgstr ""
msgid "Error while retrieving messages from the server."
msgstr ""
-#: imapjob.cpp:483
+#: imapjob.cpp:485
msgid "Error while retrieving information on the structure of a message."
msgstr ""
-#: imapjob.cpp:541
+#: imapjob.cpp:543
msgid "Uploading message data failed."
msgstr ""
-#: imapjob.cpp:546
+#: imapjob.cpp:548
msgid "Uploading message data completed."
msgstr ""
-#: imapjob.cpp:650
+#: imapjob.cpp:652
msgid "Error while copying messages."
msgstr ""
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+msgid "Import Archive"
+msgstr ""
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+msgid "No archive file selected"
+msgstr ""
+
+#: importarchivedialog.cpp:93
+msgid "Please select the folder where the archive should be imported to."
+msgstr ""
+
+#: importarchivedialog.cpp:94
+msgid "No target folder selected"
+msgstr ""
+
+#: importjob.cpp:80
+msgid "Importing the archive file '%1' into the folder '%2' succeeded."
+msgstr ""
+
+#: importjob.cpp:82
+#, c-format
+msgid ""
+"_n: 1 message was imported.\n"
+"%n messages were imported."
+msgstr ""
+
+#: importjob.cpp:83
+msgid "Import finished."
+msgstr ""
+
+#: importjob.cpp:98
+msgid "Failed to import the archive into folder '%1'."
+msgstr ""
+
+#: importjob.cpp:105
+msgid "Importing archive failed."
+msgstr ""
+
+#: importjob.cpp:114 importjob.cpp:287
+msgid "Unable to create subfolder for folder '%1'."
+msgstr ""
+
+#: importjob.cpp:214
+#, c-format
+msgid "Importing folder %1"
+msgstr ""
+
+#: importjob.cpp:234
+msgid "Failed to add a message to the folder '%1'."
+msgstr ""
+
+#: importjob.cpp:254
+msgid "Failed to upload a message to the IMAP server."
+msgstr ""
+
+#: importjob.cpp:337
+msgid "Unexpected subdirectory named '%1'."
+msgstr ""
+
+#: importjob.cpp:371
+msgid "The file '%1' does not appear to be a valid archive."
+msgstr ""
+
+#: importjob.cpp:376
+msgid "Unable to open archive file '%1'"
+msgstr ""
+
+#: importjob.cpp:382
+msgid "Importing Archive"
+msgstr ""
+
+#: keyresolver.cpp:306
msgid ""
"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
"is not fully trusted for encryption."
msgstr ""
-#: keyresolver.cpp:240
+#: keyresolver.cpp:309
+msgid ""
+"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
+"\"%1\" is not fully trusted for encryption."
+msgstr ""
+
+#: keyresolver.cpp:315
msgid ""
"\n"
"The following keys are only marginally trusted: \n"
msgstr ""
-#: keyresolver.cpp:244
+#: keyresolver.cpp:319
msgid ""
"\n"
"The following keys or certificates have unknown trust level: \n"
msgstr ""
-#: keyresolver.cpp:248
+#: keyresolver.cpp:323
+msgid ""
+"\n"
+"The following keys or certificates are <b>revoked</b>: \n"
+msgstr ""
+
+#: keyresolver.cpp:327
msgid "Not Fully Trusted Encryption Keys"
msgstr ""
-#: keyresolver.cpp:553
+#: keyresolver.cpp:642
+msgid ""
+"_n: "
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:647
+msgid ""
+"_n: "
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:652
+msgid ""
+"_n: "
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:662
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:669
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:676
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:684
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:691
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:698
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:707
+msgid ""
+"_n: "
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:712
+msgid ""
+"_n: "
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:717
+msgid ""
+"_n: "
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:724
+msgid "OpenPGP Key Expired"
+msgstr ""
+
+#: keyresolver.cpp:725
+msgid "S/MIME Certificate Expired"
+msgstr ""
+
+#: keyresolver.cpp:750
msgid ""
"_n: "
"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3705,7 +4286,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
msgid ""
"_n: "
"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3714,7 +4295,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
msgid ""
"_n: "
"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3723,7 +4304,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
msgid ""
"_n: "
"<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3736,7 +4317,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
msgid ""
"_n: "
"<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3749,7 +4330,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
msgid ""
"_n: "
"<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3760,7 +4341,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
msgid ""
"_n: "
"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3773,7 +4354,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
msgid ""
"_n: "
"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3786,7 +4367,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
msgid ""
"_n: "
"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3797,7 +4378,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
msgid ""
"_n: "
"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -3808,7 +4389,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
msgid ""
"_n: "
"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -3819,7 +4400,7 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
msgid ""
"_n: "
"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -3830,15 +4411,15 @@ msgid ""
"<p>expires in less than %n days.</p>"
msgstr ""
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
msgid "OpenPGP Key Expires Soon"
msgstr ""
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
msgid "S/MIME Certificate Expires Soon"
msgstr ""
-#: keyresolver.cpp:668
+#: keyresolver.cpp:867
msgid ""
"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
"is not usable for encryption. Please reconfigure your encryption keys and "
@@ -3847,11 +4428,11 @@ msgid ""
"prompted to specify the keys to use."
msgstr ""
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
msgid "Unusable Encryption Keys"
msgstr ""
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
msgid ""
"One or more of your configured OpenPGP signing keys or S/MIME signing "
"certificates is not usable for signing. Please reconfigure your signing keys "
@@ -3860,11 +4441,11 @@ msgid ""
"prompted to specify the keys to use."
msgstr ""
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
msgid "Unusable Signing Keys"
msgstr ""
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
msgid ""
"Examination of recipient's encryption preferences yielded that the message "
"should be encrypted using OpenPGP, at least for some recipients;\n"
@@ -3874,7 +4455,7 @@ msgid ""
"be able to read your own messages if you do so."
msgstr ""
-#: keyresolver.cpp:1007
+#: keyresolver.cpp:1222
msgid ""
"Examination of recipient's encryption preferences yielded that the message "
"should be encrypted using S/MIME, at least for some recipients;\n"
@@ -3884,7 +4465,7 @@ msgid ""
"be able to read your own messages if you do so."
msgstr ""
-#: keyresolver.cpp:1037
+#: keyresolver.cpp:1252
msgid ""
"Examination of recipient's signing preferences yielded that the message should "
"be signed using OpenPGP, at least for some recipients;\n"
@@ -3892,11 +4473,11 @@ msgid ""
"identity."
msgstr ""
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
msgid "Do Not OpenPGP-Sign"
msgstr ""
-#: keyresolver.cpp:1053
+#: keyresolver.cpp:1268
msgid ""
"Examination of recipient's signing preferences yielded that the message should "
"be signed using S/MIME, at least for some recipients;\n"
@@ -3904,104 +4485,106 @@ msgid ""
"identity."
msgstr ""
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
msgid "Do Not S/MIME-Sign"
msgstr ""
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
msgid ""
"Examination of recipient's signing preferences showed no common type of "
"signature matching your available signing keys.\n"
"Send message without signing?"
msgstr ""
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
msgid "No signing possible"
msgstr ""
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
msgid ""
"You did not select an encryption key for yourself (encrypt to self). You will "
"not be able to decrypt your own message if you encrypt it."
msgstr ""
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
msgid "Missing Key Warning"
msgstr ""
-#: keyresolver.cpp:1280 keyresolver.cpp:1318 messagecomposer.cpp:885
-#: messagecomposer.cpp:910 messagecomposer.cpp:957
+#: keyresolver.cpp:1495 keyresolver.cpp:1533 messagecomposer.cpp:883
+#: messagecomposer.cpp:908 messagecomposer.cpp:955
msgid "&Encrypt"
msgstr ""
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
msgid ""
"You did not select an encryption key for the recipient of this message; "
"therefore, the message will not be encrypted."
msgstr ""
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
msgid ""
"You did not select an encryption key for any of the recipients of this message; "
"therefore, the message will not be encrypted."
msgstr ""
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
msgid "Send &Unencrypted"
msgstr ""
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
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 ""
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
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 ""
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
msgid "Encryption Key Selection"
msgstr ""
-#: keyresolver.cpp:1408
+#: keyresolver.cpp:1628
msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"There is a problem with the encryption key(s) for \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"There is a problem with the encryption certificate(s) for \"%1\".\n"
"\n"
-"Please re-select the key(s) which should be used for this recipient."
+"Please re-select the certificate(s) which should be used for this recipient."
msgstr ""
-#: keyresolver.cpp:1452
+#: keyresolver.cpp:1678
msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"No valid and trusted encryption key was found for \"%1\".\n"
-"\n"
-"Select the key(s) which should be used for this recipient."
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\"."
+"<br/>"
+"<br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for external "
+"certificates by clicking the button: search for external certificates.</qt>"
msgstr ""
-#: keyresolver.cpp:1459
+#: keyresolver.cpp:1687
msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"More than one key matches \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"More than one certificate matches \"%1\".\n"
"\n"
-"Select the key(s) which should be used for this recipient."
+"Select the certificate(s) which should be used for this recipient."
msgstr ""
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
msgid "Name Selection"
msgstr ""
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
msgid "Which name shall the contact '%1' have in your addressbook?"
msgstr ""
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
#, c-format
msgid "Executing precommand %1"
msgstr ""
@@ -4030,11 +4613,11 @@ msgstr ""
msgid "Checking account: %1"
msgstr ""
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
msgid " completed"
msgstr ""
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
msgid "Unable to process messages: "
msgstr ""
@@ -4065,11 +4648,11 @@ msgstr ""
msgid "Moving message %3 of %2 from %1."
msgstr ""
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
msgstr ""
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
msgid ""
"_n: Fetched 1 message from mailbox %1.\n"
"Fetched %n messages from mailbox %1."
@@ -4109,134 +4692,148 @@ msgstr ""
msgid "&Maildir mailbox"
msgstr ""
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
msgid "Mail"
msgstr ""
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
msgid "Calendar"
msgstr ""
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
msgid "Contacts"
msgstr ""
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
msgid "Notes"
msgstr ""
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
msgid "Tasks"
msgstr ""
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
msgid "Journal"
msgstr ""
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
msgid "%1's %2"
msgstr ""
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
msgid "My %1 (%2)"
msgstr ""
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
#, c-format
msgid "My %1"
msgstr ""
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
msgid ""
"KMail will now create the required groupware folders as subfolders of %1; if "
"you do not want this, cancel and the IMAP resource will be disabled"
msgstr ""
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
msgid "%1: no folder found. It will be created."
msgstr ""
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
msgid "%1: found folder %2. It will be set as the main groupware folder."
msgstr ""
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
msgid ""
"<qt>KMail found the following groupware folders in %1 and needs to perform the "
"following operations: %2"
"<br>If you do not want this, cancel and the IMAP resource will be disabled"
msgstr ""
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
msgid "Standard Groupware Folders"
msgstr ""
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+msgid "Default folder"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
msgid "You do not have read/write permission to your %1 folder."
msgstr ""
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
msgid "You do not have read/write permission to your folder."
msgstr ""
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
msgid "Please wait"
msgstr ""
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
#, c-format
msgid ""
"_n: Please wait while the message is transferred\n"
"Please wait while the %n messages are transferred"
msgstr ""
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
msgid "Address copied to clipboard."
msgstr ""
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
msgid "URL copied to clipboard."
msgstr ""
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
msgstr ""
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
msgid "Save to File"
msgstr ""
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
msgid "&Replace"
msgstr ""
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
msgid "Message as Plain Text"
msgstr ""
-#: kmcommands.cpp:882
+#: kmcommands.cpp:775
+msgid ""
+"*.mbox|email messages (*.mbox)\n"
+"*|all files (*)"
+msgstr ""
+
+#: kmcommands.cpp:908
msgid "The message was removed while saving it. It has not been saved."
msgstr ""
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
msgid ""
"File %1 exists.\n"
"Do you want to replace it?"
msgstr ""
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
msgid "Open Message"
msgstr ""
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
msgid "The file does not contain a message."
msgstr ""
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
msgid "The file contains multiple messages. Only the first message is shown."
msgstr ""
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
msgid ""
"\n"
"This is a MIME digest forward. The content of the message is contained in the "
@@ -4245,302 +4842,332 @@ msgid ""
"\n"
msgstr ""
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
msgid "Filtering messages"
msgstr ""
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
msgid "Filtering message %1 of %2"
msgstr ""
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
msgid "Not enough free disk space?"
msgstr ""
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
msgid "Move to This Folder"
msgstr ""
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
msgid "Copy to This Folder"
msgstr ""
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
msgstr ""
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
msgid "Moving messages"
msgstr ""
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
msgid "Deleting messages"
msgstr ""
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
msgid "Opening URL..."
msgstr ""
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
msgstr ""
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
msgid "Execute"
msgstr ""
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
msgid "Found no attachments to save."
msgstr ""
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
msgid "Save Attachments To"
msgstr ""
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
msgid ""
"_: filename for an unnamed attachment\n"
"attachment.1"
msgstr ""
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
msgid ""
"_: filename for the %1-th unnamed attachment\n"
"attachment.%1"
msgstr ""
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
msgid "A file named %1 already exists. Do you want to overwrite it?"
msgstr ""
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
msgid "File Already Exists"
msgstr ""
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
msgid "&Overwrite"
msgstr ""
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
msgid ""
"The part %1 of the message is encrypted. Do you want to keep the encryption "
"when saving?"
msgstr ""
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
msgid "KMail Question"
msgstr ""
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
msgid "Keep Encryption"
msgstr ""
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
msgid "Do Not Keep"
msgstr ""
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
msgid ""
"The part %1 of the message is signed. Do you want to keep the signature when "
"saving?"
msgstr ""
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
msgid "Keep Signature"
msgstr ""
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
msgid ""
"_: %2 is detailed error description\n"
"Could not write the file %1:\n"
"%2"
msgstr ""
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
#, c-format
msgid "Could not write the file %1."
msgstr ""
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
msgid ""
"There is no Address Book entry for this email address. Add them to the Address "
"Book and then add instant messaging addresses using your preferred messaging "
"client."
msgstr ""
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
msgid ""
"More than one Address Book entry uses this email address:\n"
" %1\n"
" it is not possible to determine who to chat with."
msgstr ""
-#: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
msgid ""
"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
"this bug."
msgstr ""
-#: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-#: kmcommands.cpp:3204 kmcommands.cpp:3222 kmcommands.cpp:3233
-#: kmcommands.cpp:3273 kmcomposewin.cpp:5130 kmcomposewin.cpp:5135
-#: kmcomposewin.cpp:5144 messagecomposer.cpp:558 messagecomposer.cpp:566
-#: messagecomposer.cpp:580 objecttreeparser.cpp:1638
+#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
+#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
+#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
+#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: messagecomposer.cpp:581 objecttreeparser.cpp:1864
msgid "Chiasmus Backend Error"
msgstr ""
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
msgid ""
"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
"did not return a string list. Please report this bug."
msgstr ""
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
msgid ""
"No keys have been found. Please check that a valid key path has been set in the "
"Chiasmus configuration."
msgstr ""
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
msgid "Chiasmus Decryption Key Selection"
msgstr ""
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
msgid ""
"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
"bug."
msgstr ""
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
msgid ""
"The \"x-decrypt\" function does not accept the expected parameters. Please "
"report this bug."
msgstr ""
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
msgid "Chiasmus Decryption Error"
msgstr ""
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
msgid ""
"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
"not return a byte array. Please report this bug."
msgstr ""
-#: kmcommands.cpp:3425
-msgid "This attachment has been deleted."
-msgstr ""
-
-#: kmcommands.cpp:3427
-msgid "The attachment '%1' has been deleted."
-msgstr ""
-
-#: kmcommands.cpp:3541
+#: kmcommands.cpp:3581
msgid ""
"From: %1\n"
"To: %2\n"
"Subject: %3"
msgstr ""
-#: kmcommands.cpp:3551
+#: kmcommands.cpp:3591
#, c-format
msgid "Mail: %1"
msgstr ""
-#: kmcomposewin.cpp:233
-msgid "Select email address(es)"
-msgstr ""
-
-#: kmcomposewin.cpp:286
-msgid "Sticky"
+#: kmcomposewin.cpp:207
+msgid "Select an identity for this message"
msgstr ""
-#: kmcomposewin.cpp:367 kmfoldertree.cpp:1681 kmheaders.cpp:138
-#: kmheaders.cpp:183 kmmainwidget.cpp:424 kmmainwidget.cpp:431
-#: kmmainwidget.cpp:438 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
-msgid "Size"
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
msgstr ""
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
-msgid "Encoding"
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
msgstr ""
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
-msgid "Compress"
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
msgstr ""
-#: kmcomposewin.cpp:377
-msgid "Encrypt"
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
msgstr ""
-#: kmcomposewin.cpp:379
-msgid "Sign"
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
msgstr ""
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
-msgid "Name of the attachment:"
-msgstr ""
-
-#: kmcomposewin.cpp:828
-msgid ""
-"Autosaving the message as %1 failed.\n"
-"Reason: %2"
+#: kmcomposewin.cpp:248
+msgid "Select email address(es)"
msgstr ""
-#: kmcomposewin.cpp:832
-msgid "Autosaving Failed"
+#: kmcomposewin.cpp:295
+msgid "Set a subject for this message"
msgstr ""
-#: kmcomposewin.cpp:970
+#: kmcomposewin.cpp:297
msgid "&Identity:"
msgstr ""
-#: kmcomposewin.cpp:974
+#: kmcomposewin.cpp:298
msgid "&Dictionary:"
msgstr ""
-#: kmcomposewin.cpp:978
+#: kmcomposewin.cpp:299
msgid "&Sent-Mail folder:"
msgstr ""
-#: kmcomposewin.cpp:982
+#: kmcomposewin.cpp:300
msgid "&Mail transport:"
msgstr ""
-#: kmcomposewin.cpp:986
+#: kmcomposewin.cpp:301
msgid ""
"_: sender address field\n"
"&From:"
msgstr ""
-#: kmcomposewin.cpp:992
+#: kmcomposewin.cpp:302
msgid "&Reply to:"
msgstr ""
-#: kmcomposewin.cpp:1000
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr ""
+
+#: kmcomposewin.cpp:305
+msgid "Sticky"
+msgstr ""
+
+#: kmcomposewin.cpp:308
+msgid "Use the selected value as your identity for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your sent-mail folder for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:314
+msgid "Use the selected value as your outgoing account for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:317
+msgid "Use the selected value as your dictionary for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
+#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+msgid "Size"
+msgstr ""
+
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
+msgid "Encoding"
+msgstr ""
+
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+msgid "Compress"
+msgstr ""
+
+#: kmcomposewin.cpp:408
+msgid "Encrypt"
+msgstr ""
+
+#: kmcomposewin.cpp:410
+msgid "Sign"
+msgstr ""
+
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+msgid "Name of the attachment:"
+msgstr ""
+
+#: kmcomposewin.cpp:868
msgid ""
-"_: recipient address field\n"
-"&To:"
+"Autosaving the message as %1 failed.\n"
+"Reason: %2"
msgstr ""
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:872
+msgid "Autosaving Failed"
+msgstr ""
+
+#: kmcomposewin.cpp:1042
msgid "Primary Recipients"
msgstr ""
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
msgid ""
"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
msgstr ""
-#: kmcomposewin.cpp:1010
-msgid "&Copy to (CC):"
-msgstr ""
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
msgid "Additional Recipients"
msgstr ""
-#: kmcomposewin.cpp:1013
+#: kmcomposewin.cpp:1053
msgid ""
"<qt>The email addresses you put in this field receive a copy of the email. "
"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
@@ -4548,484 +5175,492 @@ msgid ""
"(CC) is a listener, not the main recipient.</qt>"
msgstr ""
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr ""
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
msgid "Hidden Recipients"
msgstr ""
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
msgid ""
"<qt>Essentially the same thing as the <b>Copy To:</b> "
"field but differs in that all other recipients do not see who receives a blind "
"copy.</qt>"
msgstr ""
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr ""
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
msgid "&Send Mail"
msgstr ""
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
msgid "&Send Mail Via"
msgstr ""
-#: kmcomposewin.cpp:1205 kmcomposewin.cpp:1214 kmcomposewin.cpp:4329
-#: redirectdialog.cpp:83
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: redirectdialog.cpp:84
msgid "Send &Later"
msgstr ""
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
msgid "Send &Later Via"
msgstr ""
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
msgid "Save as &Draft"
msgstr ""
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
msgid "Save as &Template"
msgstr ""
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
msgid "&Insert File..."
msgstr ""
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
msgid "&Insert File Recent"
msgstr ""
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
msgid "&Address Book"
msgstr ""
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
msgid "&New Composer"
msgstr ""
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
msgid "New Main &Window"
msgstr ""
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
msgid "Select &Recipients..."
msgstr ""
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
msgid "Save &Distribution List..."
msgstr ""
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
msgid "Pa&ste as Quotation"
msgstr ""
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
msgid "Paste as Attac&hment"
msgstr ""
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
msgid "Add &Quote Characters"
msgstr ""
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
msgid "Re&move Quote Characters"
msgstr ""
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
msgid "Cl&ean Spaces"
msgstr ""
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
#, no-c-format
msgid "Use Fi&xed Font"
msgstr ""
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
msgid "&Urgent"
msgstr ""
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
msgid "&Request Disposition Notification"
msgstr ""
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
msgid "Se&t Encoding"
msgstr ""
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
msgid "&Wordwrap"
msgstr ""
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
msgid "&Snippets"
msgstr ""
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
msgid "&Automatic Spellchecking"
msgstr ""
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
msgid "Auto-Detect"
msgstr ""
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
msgid "Formatting (HTML)"
msgstr ""
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
msgid "&All Fields"
msgstr ""
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
msgid "&Identity"
msgstr ""
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
msgid "&Dictionary"
msgstr ""
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
msgid "&Sent-Mail Folder"
msgstr ""
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
msgid "&Mail Transport"
msgstr ""
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
msgid "&From"
msgstr ""
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
msgid "&Reply To"
msgstr ""
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
msgid "&To"
msgstr ""
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
msgid "&CC"
msgstr ""
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
msgid "&BCC"
msgstr ""
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
msgid "S&ubject"
msgstr ""
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
msgid "Append S&ignature"
msgstr ""
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
msgid "Prepend S&ignature"
msgstr ""
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
msgid "Insert Signature At C&ursor Position"
msgstr ""
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
msgid "Attach &Public Key..."
msgstr ""
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
msgid "Attach &My Public Key"
msgstr ""
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
msgid "&Attach File..."
msgstr ""
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
msgid "&Remove Attachment"
msgstr ""
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
msgid "&Save Attachment As..."
msgstr ""
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
msgid "Attachment Pr&operties"
msgstr ""
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
msgid "&Spellchecker..."
msgstr ""
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
msgid "Encrypt Message with Chiasmus..."
msgstr ""
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
msgid "&Encrypt Message"
msgstr ""
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
msgid "&Sign Message"
msgstr ""
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
msgid "&Cryptographic Message Format"
msgstr ""
-#: kmcomposewin.cpp:1515 kmcomposewin.cpp:4970
+#: kmcomposewin.cpp:1554
+msgid "Select a cryptographic format for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
msgid "Standard"
msgstr ""
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
msgid "Bulleted List (Disc)"
msgstr ""
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
msgid "Bulleted List (Circle)"
msgstr ""
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
msgid "Bulleted List (Square)"
msgstr ""
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
msgid "Ordered List (Decimal)"
msgstr ""
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
msgid "Ordered List (Alpha lower)"
msgstr ""
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
msgid "Ordered List (Alpha upper)"
msgstr ""
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
msgid "Select Style"
msgstr ""
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+msgid "Select a list style"
+msgstr ""
+
+#: kmcomposewin.cpp:1574
+msgid "Select a font"
+msgstr ""
+
+#: kmcomposewin.cpp:1579
+msgid "Select a font size"
+msgstr ""
+
+#: kmcomposewin.cpp:1583
msgid "Align Left"
msgstr ""
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
msgid "Align Right"
msgstr ""
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
msgid "Align Center"
msgstr ""
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
msgid "&Bold"
msgstr ""
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
msgid "&Italic"
msgstr ""
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
msgid "&Underline"
msgstr ""
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
msgid "Reset Font Settings"
msgstr ""
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
msgid "Text Color..."
msgstr ""
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
msgid "Configure KMail..."
msgstr ""
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
msgid " Spellcheck: %1 "
msgstr ""
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
msgid " Column: %1 "
msgstr ""
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
msgid " Line: %1 "
msgstr ""
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
msgid "Re&save as Template"
msgstr ""
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
msgid "&Save as Draft"
msgstr ""
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
msgid ""
"Resave this message in the Templates folder. It can then be used at a later "
"time."
msgstr ""
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
msgid ""
"Save this message in the Drafts folder. It can then be edited and sent at a "
"later time."
msgstr ""
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
msgid "Do you want to save the message for later or discard it?"
msgstr ""
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
msgid "Close Composer"
msgstr ""
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
msgid ""
"The message you have composed seems to refer to an attached file but you have "
"not attached anything.\n"
"Do you want to attach a file to your message?"
msgstr ""
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
msgid "File Attachment Reminder"
msgstr ""
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
msgid "&Send as Is"
msgstr ""
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
msgid ""
"<qt>"
"<p>KMail could not recognize the location of the attachment (%1);</p>"
"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
msgstr ""
-#: kmcomposewin.cpp:2359
+#: kmcomposewin.cpp:2424
msgid ""
"<qt>"
"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
msgstr ""
-#: kmcomposewin.cpp:2697
+#: kmcomposewin.cpp:2777
msgid "Attach File"
msgstr ""
#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
#, no-c-format
msgid "&Attach"
msgstr ""
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
msgid "Insert File"
msgstr ""
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
msgid ""
"<qt>"
"<p>An error occurred while trying to export the key from the backend:</p>"
"<p><b>%1</b></p></qt>"
msgstr ""
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
msgid "Key Export Failed"
msgstr ""
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
msgid "Exporting key..."
msgstr ""
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
#, c-format
msgid "OpenPGP key 0x%1"
msgstr ""
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
msgid "Attach Public OpenPGP Key"
msgstr ""
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
msgid "Select the public key which should be attached."
msgstr ""
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
msgid ""
"_: to open\n"
"Open"
msgstr ""
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
msgid "Open With..."
msgstr ""
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
msgid ""
"_: to view\n"
"View"
msgstr ""
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
msgid "Edit With..."
msgstr ""
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
msgid "Add Attachment..."
msgstr ""
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
msgid "KMail could not compress the file."
msgstr ""
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
msgid ""
"The compressed file is larger than the original. Do you want to keep the "
"original one?"
msgstr ""
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
msgid "Keep"
msgstr ""
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
msgid "KMail could not uncompress the file."
msgstr ""
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
msgid "Save Attachment As"
msgstr ""
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
msgid "Add as Text"
msgstr ""
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
msgid "Add as Attachment"
msgstr ""
-#: kmcomposewin.cpp:3771
+#: kmcomposewin.cpp:3858
msgid ""
"Please select whether you want to insert the content as text into the editor, "
"or append the referenced file as an attachment."
msgstr ""
-#: kmcomposewin.cpp:3773
+#: kmcomposewin.cpp:3860
msgid "Paste as text or attachment?"
msgstr ""
-#: kmcomposewin.cpp:3848 kmfilterdlg.cpp:705 kmfolderdia.cpp:274
-#: kmfolderdia.cpp:632 kmfoldertree.cpp:1603 managesievescriptsdialog.cpp:280
+#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
msgid "unnamed"
msgstr ""
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
msgid ""
"<qt>"
"<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5034,11 +5669,11 @@ msgid ""
"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
msgstr ""
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
msgid "Undefined Encryption Key"
msgstr ""
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
msgid ""
"<qt>"
"<p>In order to be able to sign this message you first have to define the "
@@ -5046,220 +5681,250 @@ msgid ""
"<p>Please select the key to use in the identity configuration.</p></qt>"
msgstr ""
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
msgid "Undefined Signing Key"
msgstr ""
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
msgid ""
"KMail is currently in offline mode,your messages will be kept in the outbox "
"until you go online."
msgstr ""
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
msgid "Online/Offline"
msgstr ""
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
msgid ""
"You must enter your email address in the From: field. You should also set your "
"email address for all identities, so that you do not have to enter it for each "
"message."
msgstr ""
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
msgid ""
"You must specify at least one receiver,either in the To: field or as CC or as "
"BCC."
msgstr ""
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
msgid "To field is missing.Send message anyway?"
msgstr ""
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
msgid "No To: specified"
msgstr ""
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
msgid "You did not specify a subject. Send message anyway?"
msgstr ""
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
msgid "No Subject Specified"
msgstr ""
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
msgid "S&end as Is"
msgstr ""
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
msgid "&Specify the Subject"
msgstr ""
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
msgid "&Keep markup, do not sign/encrypt"
msgstr ""
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
msgid "&Keep markup, do not encrypt"
msgstr ""
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
msgid "&Keep markup, do not sign"
msgstr ""
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
msgid "Sign/Encrypt (delete markup)"
msgstr ""
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
msgid "Encrypt (delete markup)"
msgstr ""
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
msgid "Sign (delete markup)"
msgstr ""
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
msgid ""
"<qt>"
"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
"<p>do you want to delete your markup?</p></qt>"
msgstr ""
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
msgid "Sign/Encrypt Message?"
msgstr ""
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
msgid ""
"The custom drafts or templates folder for identify \"%1\" does not exist "
"(anymore); therefore, the default drafts or templates folder will be used."
msgstr ""
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr ""
+
+#: kmcomposewin.cpp:4456
msgid "About to send email..."
msgstr ""
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
msgid "Send Confirmation"
msgstr ""
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
msgid "&Send Now"
msgstr ""
-#: kmcomposewin.cpp:4549
+#: kmcomposewin.cpp:4479
+msgid ""
+"You are trying to send the mail to more than %1 recipients. Send message "
+"anyway?"
+msgstr ""
+
+#: kmcomposewin.cpp:4480
+msgid "Too many receipients"
+msgstr ""
+
+#: kmcomposewin.cpp:4482
+msgid "&Edit Recipients"
+msgstr ""
+
+#: kmcomposewin.cpp:4728
msgid "Spellcheck: on"
msgstr ""
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
msgid "Spellcheck: off"
msgstr ""
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
msgid " Spell check canceled."
msgstr ""
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
msgid " Spell check stopped."
msgstr ""
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
msgid " Spell check complete."
msgstr ""
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
msgid "Spellchecker"
msgstr ""
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
msgid ""
"Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
"You can do this in the Crypto Backends tab of the configure dialog's Security "
"page."
msgstr ""
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
msgid ""
"It looks as though libkleopatra was compiled without Chiasmus support. You "
"might want to recompile libkleopatra with --enable-chiasmus."
msgstr ""
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
msgid "No Chiasmus Backend Configured"
msgstr ""
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
msgid "No Chiasmus Keys Found"
msgstr ""
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
msgid "Chiasmus Encryption Key Selection"
msgstr ""
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
msgid "Message will be signed"
msgstr ""
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
msgid "Message will not be signed"
msgstr ""
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
msgid "Message will be encrypted"
msgstr ""
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
msgid "Message will not be encrypted"
msgstr ""
-#: kmedit.cpp:391
+#: kmedit.cpp:458
msgid "Unable to start external editor."
msgstr ""
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+msgid "No Suggestions"
+msgstr ""
+
+#: kmedit.cpp:529
+msgid "Add to Dictionary"
+msgstr ""
+
+#: kmedit.cpp:530
+msgid "Ignore All"
msgstr ""
-#: kmedit.cpp:494
+#: kmedit.cpp:587
msgid "Automatic spellchecking is not possible on text with markup."
msgstr ""
-#: kmedit.cpp:538
+#: kmedit.cpp:631
msgid ""
"The external editor is still running.\n"
"Abort the external editor or leave it open?"
msgstr ""
-#: kmedit.cpp:541
+#: kmedit.cpp:634
msgid "Abort Editor"
msgstr ""
-#: kmedit.cpp:541
+#: kmedit.cpp:634
msgid "Leave Editor Open"
msgstr ""
-#: kmedit.cpp:565
+#: kmedit.cpp:661
msgid "Spellcheck - KMail"
msgstr ""
-#: kmedit.cpp:734
+#: kmedit.cpp:884
msgid ""
"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
"properly configured and in your PATH."
msgstr ""
-#: kmedit.cpp:743
+#: kmedit.cpp:893
msgid "ISpell/Aspell seems to have crashed."
msgstr ""
-#: kmedit.cpp:752
+#: kmedit.cpp:902
msgid "No misspellings encountered."
msgstr ""
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+msgid "Open Address Book"
+msgstr ""
+
+#: kmfawidgets.cpp:107
msgid "Select Sound File"
msgstr ""
@@ -5282,191 +5947,219 @@ msgid ""
"<br>Ignoring it.</qt>"
msgstr ""
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
msgid "Confirm Delivery"
msgstr ""
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
msgid "Set Transport To"
msgstr ""
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
msgid "Set Reply-To To"
msgstr ""
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
msgid "Set Identity To"
msgstr ""
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
msgid "Mark As"
msgstr ""
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
msgid ""
"_: msg status\n"
"Important"
msgstr ""
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
msgid ""
"_: msg status\n"
"Read"
msgstr ""
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
msgid ""
"_: msg status\n"
"Unread"
msgstr ""
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
msgid ""
"_: msg status\n"
"Replied"
msgstr ""
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
msgid ""
"_: msg status\n"
"Forwarded"
msgstr ""
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
msgid ""
"_: msg status\n"
"Old"
msgstr ""
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
msgid ""
"_: msg status\n"
"New"
msgstr ""
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
msgid ""
"_: msg status\n"
"Watched"
msgstr ""
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
msgid ""
"_: msg status\n"
"Ignored"
msgstr ""
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
msgid ""
"_: msg status\n"
"Spam"
msgstr ""
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
msgid ""
"_: msg status\n"
"Ham"
msgstr ""
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
msgid "Send Fake MDN"
msgstr ""
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
msgid ""
"_: MDN type\n"
"Ignore"
msgstr ""
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
msgid ""
"_: MDN type\n"
"Displayed"
msgstr ""
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
msgid ""
"_: MDN type\n"
"Deleted"
msgstr ""
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
msgid ""
"_: MDN type\n"
"Dispatched"
msgstr ""
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
msgid ""
"_: MDN type\n"
"Processed"
msgstr ""
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
msgid ""
"_: MDN type\n"
"Denied"
msgstr ""
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
msgid ""
"_: MDN type\n"
"Failed"
msgstr ""
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
msgid "Remove Header"
msgstr ""
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
msgid "Add Header"
msgstr ""
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
msgid "With value:"
msgstr ""
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
msgid "Rewrite Header"
msgstr ""
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
msgid "Replace:"
msgstr ""
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
msgid "With:"
msgstr ""
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
msgid "Move Into Folder"
msgstr ""
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
msgid "Copy Into Folder"
msgstr ""
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
msgid "Forward To"
msgstr ""
-#: kmfilteraction.cpp:1565
+#: kmfilteraction.cpp:1508
+msgid "The addressee the message will be forwarded to"
+msgstr ""
+
+#: kmfilteraction.cpp:1509
+msgid "The filter will forward the message to the addressee entered here."
+msgstr ""
+
+#: kmfilteraction.cpp:1515
+msgid "Default Template"
+msgstr ""
+
+#: kmfilteraction.cpp:1525
+msgid "The template used when forwarding"
+msgstr ""
+
+#: kmfilteraction.cpp:1526
+msgid "Set the forwarding template that will be used with this filter."
+msgstr ""
+
+#: kmfilteraction.cpp:1620
+msgid "Forward to %1 with default template "
+msgstr ""
+
+#: kmfilteraction.cpp:1622
+msgid "Forward to %1 with template %2"
+msgstr ""
+
+#: kmfilteraction.cpp:1643
msgid "Redirect To"
msgstr ""
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
msgid "Execute Command"
msgstr ""
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
msgid "Pipe Through"
msgstr ""
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
msgid "Play Sound"
msgstr ""
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
msgid ""
"<qt>"
"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -5474,7 +6167,7 @@ msgid ""
"the dialog.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
msgid ""
"<qt>"
"<p>Click this button to create a new filter.</p>"
@@ -5484,7 +6177,7 @@ msgid ""
"on the <em>Delete</em> button.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
msgid ""
"<qt>"
"<p>Click this button to copy a filter.</p>"
@@ -5492,7 +6185,7 @@ msgid ""
"on the <em>Delete</em> button.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
msgid ""
"<qt>"
"<p>Click this button to <em>delete</em> the currently-selected filter from the "
@@ -5502,7 +6195,7 @@ msgid ""
"made.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
msgid ""
"<qt>"
"<p>Click this button to move the currently-selected filter to the <em>top</em> "
@@ -5512,7 +6205,7 @@ msgid ""
"first.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
msgid ""
"<qt>"
"<p>Click this button to move the currently-selected filter <em>up</em> "
@@ -5524,7 +6217,7 @@ msgid ""
"on the <em>Down</em> button.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
msgid ""
"<qt>"
"<p>Click this button to move the currently-selected filter <em>down</em> "
@@ -5536,7 +6229,7 @@ msgid ""
"on the <em>Up</em> button.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
msgid ""
"<qt>"
"<p>Click this button to move the currently-selected filter to the <em>"
@@ -5546,7 +6239,7 @@ msgid ""
"first.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
msgid ""
"<qt>"
"<p>Click this button to rename the currently-selected filter.</p>"
@@ -5556,7 +6249,7 @@ msgid ""
"in the appearing dialog.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
msgid ""
"<qt>"
"<p>Check this button to force the confirmation dialog to be displayed.</p>"
@@ -5567,148 +6260,156 @@ msgid ""
"differently.</p></qt>"
msgstr ""
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
msgid "POP3 Filter Rules"
msgstr ""
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
msgid "Filter Rules"
msgstr ""
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
msgid "Available Filters"
msgstr ""
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
msgid "A&dvanced"
msgstr ""
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
msgid "Filter Criteria"
msgstr ""
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
msgid "Filter Action"
msgstr ""
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
msgid "Global Options"
msgstr ""
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
msgid "Always &show matched 'Download Later' messages in confirmation dialog"
msgstr ""
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
msgid "Filter Actions"
msgstr ""
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
msgid "Advanced Options"
msgstr ""
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
msgid "Apply this filter to incoming messages:"
msgstr ""
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
msgid "from all accounts"
msgstr ""
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
msgid "from all but online IMAP accounts"
msgstr ""
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
msgid "from checked accounts only"
msgstr ""
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
msgid "Account Name"
msgstr ""
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
msgid "Apply this filter to &sent messages"
msgstr ""
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
msgid "Apply this filter on manual &filtering"
msgstr ""
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
msgid "If this filter &matches, stop processing here"
msgstr ""
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
msgid "Add this filter to the Apply Filter menu"
msgstr ""
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
msgid "Shortcut:"
msgstr ""
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
msgid "Additionally add this filter to the toolbar"
msgstr ""
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
msgid "Icon for this filter:"
msgstr ""
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
msgid "Up"
msgstr ""
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
msgid "Down"
msgstr ""
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
msgid "Rename..."
msgstr ""
#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:629 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
#, no-c-format
msgid "New"
msgstr ""
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+msgid "Select Source Folders"
+msgstr ""
+
+#: kmfilterdlg.cpp:756
msgid ""
"At least one filter targets a folder on an online IMAP account. Such filters "
"will only be applied when manually filtering and when filtering incoming online "
"IMAP mail."
msgstr ""
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
msgid ""
"The following filters have not been saved because they were invalid (e.g. "
"containing no actions or no search rules)."
msgstr ""
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
msgid "Rename Filter"
msgstr ""
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
msgid ""
"Rename filter \"%1\" to:\n"
"(leave the field empty for automatic naming)"
msgstr ""
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+msgid "Select Folders to Filter"
+msgstr ""
+
+#: kmfilterdlg.cpp:1136
msgid "Please select an action."
msgstr ""
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
msgid "&Download mail"
msgstr ""
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
msgid "Download mail la&ter"
msgstr ""
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
msgid "D&elete mail from server"
msgstr ""
@@ -5716,10 +6417,28 @@ msgstr ""
msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
msgstr ""
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
msgid "Failed to create folder"
msgstr ""
+#: kmfolder.cpp:907
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:913
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:932
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr ""
+
#: kmfoldercachedimap.cpp:107
msgid "Troubleshooting IMAP Cache"
msgstr ""
@@ -5767,174 +6486,173 @@ msgstr ""
msgid "Refresh &Cache"
msgstr ""
-#: kmfoldercachedimap.cpp:203
+#: kmfoldercachedimap.cpp:216
msgid ""
"The UID cache file for folder %1 could not be read. There could be a problem "
"with file system permission, or it is corrupted."
msgstr ""
-#: kmfoldercachedimap.cpp:452
+#: kmfoldercachedimap.cpp:488
msgid ""
"The UID cache file for folder %1 could not be written. There could be a problem "
"with file system permission."
msgstr ""
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
msgid "You must synchronize with the server before renaming IMAP folders."
msgstr ""
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
msgid ""
"No account setup for this folder.\n"
"Please try running a sync before this."
msgstr ""
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
msgid ""
"Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
"subfolders?\n"
"This will remove all changes you have done locally to your folders."
msgstr ""
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
msgid "Refresh IMAP Cache"
msgstr ""
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
msgid "&Refresh"
msgstr ""
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
msgid "The index of this folder has been recreated."
msgstr ""
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
msgid ""
"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
"to initial sync state and sync anyway?"
msgstr ""
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
msgid "Reset && Sync"
msgstr ""
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
msgid "Synchronization skipped"
msgstr ""
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
msgid "Synchronizing"
msgstr ""
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
#, c-format
msgid "Connecting to %1"
msgstr ""
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
msgid "Checking permissions"
msgstr ""
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
msgid "Renaming folder"
msgstr ""
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
msgid "Retrieving folderlist"
msgstr ""
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
msgid "Error while retrieving the folderlist"
msgstr ""
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
msgid "Retrieving subfolders"
msgstr ""
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
msgid "Deleting folders from server"
msgstr ""
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
msgid "Retrieving message list"
msgstr ""
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
msgid "No messages to delete..."
msgstr ""
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
msgid "Expunging deleted messages"
msgstr ""
-#: kmfoldercachedimap.cpp:1019
-msgid "Retrieving new messages"
+#: kmfoldercachedimap.cpp:1096
+#, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
msgstr ""
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
msgid "No new messages from server"
msgstr ""
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
msgid "Checking annotation support"
msgstr ""
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
msgid "Retrieving annotations"
msgstr ""
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
msgid "Setting annotations"
msgstr ""
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
msgid "Setting permissions"
msgstr ""
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
msgid "Retrieving permissions"
msgstr ""
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
msgid "Getting quota information"
msgstr ""
-#: kmfoldercachedimap.cpp:1218
-msgid "Updating cache file"
-msgstr ""
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
msgid "Synchronization done"
msgstr ""
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
msgid "Uploading messages to server"
msgstr ""
-#: kmfoldercachedimap.cpp:1342
+#: kmfoldercachedimap.cpp:1480
msgid ""
"<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
"longer be possible to add messages to this folder.</p>"
msgstr ""
-#: kmfoldercachedimap.cpp:1344
+#: kmfoldercachedimap.cpp:1482
msgid "Acces rights revoked"
msgstr ""
-#: kmfoldercachedimap.cpp:1347 kmfoldercachedimap.cpp:1402
-#: kmfoldercachedimap.cpp:1447
+#: kmfoldercachedimap.cpp:1485 kmfoldercachedimap.cpp:1545
+#: kmfoldercachedimap.cpp:1596
msgid "No messages to upload to server"
msgstr ""
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
msgid "Uploading status of messages to server"
msgstr ""
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
msgid "Creating subfolders on server"
msgstr ""
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
msgid ""
"<qt>"
"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
@@ -5942,55 +6660,55 @@ msgid ""
"<br>UIDs: %2</p></qt>"
msgstr ""
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
msgid "Deleting removed messages from server"
msgstr ""
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
msgid "Checking folder validity"
msgstr ""
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
msgid "Folder listing failed in interesting ways."
msgstr ""
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
#, c-format
msgid "Retrieving folders for namespace %1"
msgstr ""
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
msgid ""
"<qt>"
"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
"from the server?</p></qt>"
msgstr ""
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
msgid "Aborted"
msgstr ""
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
msgid ""
"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
"cannot be used on this server; please re-configure KMail differently."
msgstr ""
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
msgid ""
"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
"cannot be used on this server, please re-configure KMail differently"
msgstr ""
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
msgid "Error while setting annotation: "
msgstr ""
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
msgid "lost+found"
msgstr ""
-#: kmfoldercachedimap.cpp:2895
+#: kmfoldercachedimap.cpp:3117
msgid ""
"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
"the server yet, but the folder has been deleted on the server or you do not "
@@ -5999,11 +6717,11 @@ msgid ""
"to avoid data loss.</p>"
msgstr ""
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
msgid "Insufficient access rights"
msgstr ""
-#: kmfoldercachedimap.cpp:2907
+#: kmfoldercachedimap.cpp:3129
msgid ""
"<p>There are new messages in this folder (%1), which have not been uploaded to "
"the server yet, but the folder has been deleted on the server or you do not "
@@ -6013,55 +6731,62 @@ msgid ""
"<p>Do you want to move these messages to another folder now?</p>"
msgstr ""
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
msgid "Do Not Move"
msgstr ""
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
msgid "Move Messages to Folder"
msgstr ""
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
msgid "Permissions (ACL)"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:121 rc.cpp:221 snippetwidget.cpp:119
+#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
#, no-c-format
msgid "General"
msgstr ""
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
msgid "Templates"
msgstr ""
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
msgid "Access Control"
msgstr ""
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
msgid "Quota"
msgstr ""
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
#, no-c-format
msgid "Use custom &icons"
msgstr ""
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
msgid "&Normal:"
msgstr ""
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
msgid "&Unread:"
msgstr ""
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
msgid "Act on new/unread mail in this folder"
msgstr ""
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
msgid ""
"<qt>"
"<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6073,49 +6798,49 @@ msgid ""
"new/unread mail in your trash and spam folder.</p></qt>"
msgstr ""
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
msgid "Include this folder in mail checks"
msgstr ""
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
msgid "Keep replies in this folder"
msgstr ""
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
msgid ""
"Check this option if you want replies you write to mails in this folder to be "
"put in this same folder after sending, instead of in the configured sent-mail "
"folder."
msgstr ""
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
msgid "Show Sender/Receiver Column in List of Messages"
msgstr ""
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
msgid "Sho&w column:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:411 kmheaders.cpp:181 kmheaders.cpp:243 kmheaders.cpp:378
-#: kmheaders.cpp:549 kmheaders.cpp:765 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:287
+#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
+#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
#, no-c-format
msgid "Sender"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:412 kmheaders.cpp:139 kmheaders.cpp:184 kmheaders.cpp:240
-#: kmheaders.cpp:245 kmheaders.cpp:380 kmheaders.cpp:551 kmheaders.cpp:767
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:290
+#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
+#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
+#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
#, no-c-format
msgid "Receiver"
msgstr ""
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
msgid "&Sender identity:"
msgstr ""
-#: kmfolderdia.cpp:429
+#: kmfolderdia.cpp:486
msgid ""
"Select the sender identity to be used when writing new mail or replying to mail "
"in this folder. This means that if you are in one of your work folders, you can "
@@ -6124,15 +6849,15 @@ msgid ""
"configuration dialog. (Settings -> Configure KMail)"
msgstr ""
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
msgid "&Folder contents:"
msgstr ""
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
msgid "Generate free/&busy and activate alarms for:"
msgstr ""
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
msgid ""
"This setting defines which users sharing this folder should get \"busy\" "
"periods in their freebusy lists and should see the alarms for the events or "
@@ -6148,28 +6873,39 @@ msgid ""
"is not known who will go to those events."
msgstr ""
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
msgid "Nobody"
msgstr ""
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
msgid "Admins of This Folder"
msgstr ""
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
msgid "All Readers of This Folder"
msgstr ""
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
msgid ""
"This setting allows you to disable alarms for folders shared by others. "
msgstr ""
-#: kmfolderdia.cpp:506
-msgid "Block free/&busy and alarms locally"
+#: kmfolderdia.cpp:562
+msgid "Block alarms locally"
msgstr ""
-#: kmfolderdia.cpp:585
+#: kmfolderdia.cpp:576
+msgid "Share unread state with all users"
+msgstr ""
+
+#: kmfolderdia.cpp:579
+msgid ""
+"If enabled, the unread state of messages in this folder will be the same for "
+"all users having access to this folders. If disabled (the default), every user "
+"with access to this folder has her own unread state."
+msgstr ""
+
+#: kmfolderdia.cpp:661
msgid ""
"You have configured this folder to contain groupware information and the "
"general configuration option to hide groupware folders is set. That means that "
@@ -6178,88 +6914,88 @@ msgid ""
"groupware folders to be able to see it."
msgstr ""
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
msgstr ""
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
msgstr ""
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
msgid "Removing folder"
msgstr ""
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
#, c-format
msgid "URL: %1"
msgstr ""
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
msgid "Error while removing a folder."
msgstr ""
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
#, c-format
msgid "Destination folder: %1"
msgstr ""
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
msgid "checking"
msgstr ""
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
msgid "Error while querying the server status."
msgstr ""
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
msgid "Retrieving message status"
msgstr ""
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
msgid "Retrieving messages"
msgstr ""
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
#, c-format
msgid "Error while listing the contents of the folder %1."
msgstr ""
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
msgid "Error while retrieving messages."
msgstr ""
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
msgid "Error while creating a folder."
msgstr ""
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
msgid "updating message counts"
msgstr ""
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
msgid "Error while getting folder information."
msgstr ""
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
msgid ""
"The mail index for '%1' is from an unknown version of KMail (%2).\n"
"This index can be regenerated from your mail folder, but some information, "
"including status flags, may be lost. Do you wish to downgrade your index file?"
msgstr ""
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
msgid "Downgrade"
msgstr ""
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
msgid "Do Not Downgrade"
msgstr ""
-#: kmfolderindex.cpp:491
+#: kmfolderindex.cpp:529
msgid ""
"The mail index for '%1' is corrupted and will be regenerated now, but some "
-"information, including status flags, will be lost."
+"information, like status flags, might get lost."
msgstr ""
#: kmfoldermaildir.cpp:89
@@ -6276,35 +7012,35 @@ msgstr ""
msgid "Folder `%1' changed; recreating index."
msgstr ""
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
msgid "Could not sync maildir folder."
msgstr ""
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
msgid "Message could not be added to the folder, possibly disk space is low."
msgstr ""
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
msgstr ""
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
msgid "Writing index file"
msgstr ""
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
msgid ""
"Your outbox contains messages which were most-likely not created by KMail;\n"
"please remove them from there if you do not want KMail to send them."
msgstr ""
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
msgid ""
"Cannot open file \"%1\":\n"
"%2"
msgstr ""
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
msgid ""
"<qt>"
"<p>The index of folder '%2' seems to be out of date. To prevent message "
@@ -6315,38 +7051,38 @@ msgid ""
"this problem from happening again.</p></qt>"
msgstr ""
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
msgid "Index Out of Date"
msgstr ""
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
msgid "Folder `%1' changed. Recreating index."
msgstr ""
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
msgid "Could not sync index file <b>%1</b>: %2"
msgstr ""
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
msgid "Internal error. Please copy down the details and report a bug."
msgstr ""
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
#, c-format
msgid ""
"_n: Creating index file: one message done\n"
"Creating index file: %n messages done"
msgstr ""
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
msgid "Could not add message to folder: "
msgstr ""
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
msgid "Could not add message to folder:"
msgstr ""
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
msgid "Could not add message to folder (No space left on device?)"
msgstr ""
@@ -6354,11 +7090,11 @@ msgstr ""
msgid "Are you sure you want to expire old messages?"
msgstr ""
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
msgid "Expire Old Messages?"
msgstr ""
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
msgid "Expire"
msgstr ""
@@ -6368,13 +7104,13 @@ msgid ""
"Please move the file out of the way."
msgstr ""
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
msgid ""
"The permissions of the folder '%1' are incorrect;\n"
"please make sure that you can view and modify the content of this folder."
msgstr ""
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
msgid ""
"KMail could not create folder '%1';\n"
"please make sure that you can view and modify the content of the folder '%2'."
@@ -6390,223 +7126,226 @@ msgstr ""
msgid "Could Not Create Folder"
msgstr ""
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
msgid ""
"Cannot create file `%1' in %2.\n"
"KMail cannot start without it."
msgstr ""
-#: kmfolderseldlg.cpp:96 kmfolderseldlg.cpp:380 kmfolderseldlg.cpp:414
-#: kmfolderseldlg.cpp:416
-msgid "Path"
-msgstr ""
-
-#: kmfolderseldlg.cpp:283 kmfolderseldlg.cpp:445 kmfolderseldlg.cpp:465
-#: kmfoldertree.cpp:1056 kmfoldertree.cpp:1077
+#: kmfolderseldlg.cpp:25 kmfolderseldlg.cpp:47 kmfoldertree.cpp:1091
+#: kmfoldertree.cpp:1112 treebase.cpp:99
msgid "&New Subfolder..."
msgstr ""
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
msgid "Create a new subfolder under the currently selected folder"
msgstr ""
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
msgid "View Columns"
msgstr ""
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
msgid "Unread Column"
msgstr ""
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
msgid "Total Column"
msgstr ""
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
msgid "Size Column"
msgstr ""
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
msgid "Searches"
msgstr ""
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
msgstr ""
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
msgid "Go to Next Unread Message"
msgstr ""
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
msgid "Go To"
msgstr ""
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
msgid "Do Not Go To"
msgstr ""
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
msgid "&New Folder..."
msgstr ""
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
msgid "Check &Mail"
msgstr ""
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
msgid "&Copy Folder To"
msgstr ""
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
msgid "&Move Folder To"
msgstr ""
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
msgid "Add to Favorite Folders"
msgstr ""
-#: kmfoldertree.cpp:1123
-msgid "Subscription..."
+#: kmfoldertree.cpp:1160
+msgid "Serverside Subscription..."
msgstr ""
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
msgid "Local Subscription..."
msgstr ""
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
msgid "Refresh Folder List"
msgstr ""
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
msgid "&Troubleshoot IMAP Cache..."
msgstr ""
-#: kmfoldertree.cpp:1242
+#: kmfoldertree.cpp:1280
msgid ""
-"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
-"server. If you think you should be able to create subfolders here, ask your "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
+"the server. If you think you should be able to create subfolders here, ask your "
"administrator to grant you rights to do so.</qt> "
msgstr ""
-#: kmfoldertree.cpp:1657 kmmainwidget.cpp:420 kmmainwidget.cpp:427
-#: kmmainwidget.cpp:434 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
+#: kmmainwidget.cpp:426 kmsearchpattern.h:220
msgid "Unread"
msgstr ""
-#: kmfoldertree.cpp:1670 kmmainwidget.cpp:422 kmmainwidget.cpp:429
-#: kmmainwidget.cpp:436
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
+#: kmmainwidget.cpp:428
msgid "Total"
msgstr ""
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
msgid ""
"<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
"name already exists.</qt>"
msgstr ""
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
msgid ""
"<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
"itself.</qt>"
msgstr ""
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
msgid ""
"<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
msgstr ""
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
msgid "Moving the selected folders is not possible"
msgstr ""
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
msgid "Status"
msgstr ""
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
msgid "Important"
msgstr ""
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
msgid "Action Item"
msgstr ""
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
msgid "Attachment"
msgstr ""
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+msgid "Invitation"
+msgstr ""
+
+#: kmheaders.cpp:137
msgid "Spam/Ham"
msgstr ""
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
msgid "Watched/Ignored"
msgstr ""
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
msgid "Signature"
msgstr ""
-#: kmheaders.cpp:180 kmheaders.cpp:775 kmheaders.cpp:2604
-#: kmpopfiltercnfrmdlg.cpp:39 searchwindow.cpp:224
-#: templatesinsertcommand.cpp:142 templatesinsertcommand.cpp:243
+#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
msgid "Subject"
msgstr ""
-#: kmheaders.cpp:182 kmheaders.cpp:770 kmheaders.cpp:2599
-#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:228
-#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:167
+#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
+#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
msgid "Date"
msgstr ""
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
msgid "Order of Arrival"
msgstr ""
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
msgid " (Status)"
msgstr ""
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
#, c-format
msgid ""
"_n: 1 unsent\n"
"%n unsent"
msgstr ""
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
msgid "0 unsent"
msgstr ""
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
#, c-format
msgid ""
"_n: 1 unread\n"
"%n unread"
msgstr ""
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
msgid "0 unread"
msgstr ""
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
msgid ""
"_n: 1 message, %1.\n"
"%n messages, %1."
msgstr ""
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
msgid "0 messages"
msgstr ""
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
msgid ""
"_: %1 = n messages, m unread.\n"
"%1 Folder is read-only."
msgstr ""
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
#, c-format
msgid ""
"_n: <qt>Do you really want to delete the selected message?"
@@ -6615,132 +7354,144 @@ msgid ""
"<br>Once deleted, they cannot be restored.</qt>"
msgstr ""
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
msgid "Delete Messages"
msgstr ""
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
msgid "Delete Message"
msgstr ""
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
msgid "Messages deleted successfully."
msgstr ""
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
msgid "Messages moved successfully"
msgstr ""
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
msgid "Deleting messages failed."
msgstr ""
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
msgid "Moving messages failed."
msgstr ""
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
msgid "Deleting messages canceled."
msgstr ""
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
msgid "Moving messages canceled."
msgstr ""
-#: kmheaders.cpp:2431 kmmainwidget.cpp:2977 kmreadermainwin.cpp:470
-#: searchwindow.cpp:833
+#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: searchwindow.cpp:856
msgid "&Copy To"
msgstr ""
-#: kmheaders.cpp:2434 kmheaders.cpp:2440 kmmainwidget.cpp:2974
-#: searchwindow.cpp:834
+#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: searchwindow.cpp:857
msgid "&Move To"
msgstr ""
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
msgid ""
"Failure modifying %1\n"
"(No space left on device?)"
msgstr ""
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
msgid "Certificate Signature Request"
msgstr ""
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
msgid "Please create a certificate from attachment and return to sender."
msgstr ""
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
msgid "KMail is set to be offline; all network jobs are suspended"
msgstr ""
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
msgid "KMail is set to be online; all network jobs resumed"
msgstr ""
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
msgid "KMail is currently in offline mode. How do you want to proceed?"
msgstr ""
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
msgid "Work Online"
msgstr ""
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
msgid "Work Offline"
msgstr ""
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
msgid "You do not have read/write permission to your inbox folder."
msgstr ""
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
msgid "outbox"
msgstr ""
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
msgid "You do not have read/write permission to your outbox folder."
msgstr ""
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
msgid "sent-mail"
msgstr ""
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
msgid "You do not have read/write permission to your sent-mail folder."
msgstr ""
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
msgid "trash"
msgstr ""
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
msgid "You do not have read/write permission to your trash folder."
msgstr ""
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
msgid "drafts"
msgstr ""
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
msgid "You do not have read/write permission to your drafts folder."
msgstr ""
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
msgid "templates"
msgstr ""
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
msgid "You do not have read/write permission to your templates folder."
msgstr ""
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
msgid "Last Search"
msgstr ""
-#: kmkernel.cpp:1777
+#: kmkernel.cpp:1716
+msgid ""
+"There is a problem with the mail index of the following folders, the indices "
+"will now be regenerated.\n"
+"This can happen because the index files are out of date, missing or corrupted.\n"
+"Contact your administrator if this happens frequently.\n"
+"Some information, like status flags, might get lost."
+msgstr ""
+
+#: kmkernel.cpp:1721
+msgid "Problem with mail indices"
+msgstr ""
+
+#: kmkernel.cpp:1879
msgid ""
"_: %1-%3 is the application name, %4-%7 are folder path\n"
"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -6750,7 +7501,7 @@ msgid ""
"<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
msgstr ""
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
msgid ""
"_: %1-%3 is the application name, %4-%6 are folder path\n"
"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -6759,15 +7510,15 @@ msgid ""
"<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
msgstr ""
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
msgid "Migrate Mail Files?"
msgstr ""
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
msgid "KMail encountered a fatal error and will terminate now"
msgstr ""
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
#, c-format
msgid ""
"KMail encountered a fatal error and will terminate now.\n"
@@ -6775,149 +7526,160 @@ msgid ""
"%1"
msgstr ""
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
msgid "Empty Trash"
msgstr ""
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
msgid "Are you sure you want to empty the trash folders of all accounts?"
msgstr ""
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
msgid "vCard Import Failed"
msgstr ""
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
msgid "<qt>Unable to access <b>%1</b>.</qt>"
msgstr ""
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
msgid "Recent Addresses"
msgstr ""
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
msgid "S&earch:"
msgstr ""
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
msgid "Move Message to Folder"
msgstr ""
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
msgid "Copy Message to Folder"
msgstr ""
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
msgid "Jump to Folder"
msgstr ""
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
msgid "Remove Duplicate Messages"
msgstr ""
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
msgid "Abort Current Operation"
msgstr ""
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
msgid "Focus on Next Folder"
msgstr ""
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
msgid "Focus on Previous Folder"
msgstr ""
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
msgid "Select Folder with Focus"
msgstr ""
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
msgid "Focus on Next Message"
msgstr ""
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
msgid "Focus on Previous Message"
msgstr ""
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
msgid "Select Message with Focus"
msgstr ""
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
msgid ""
"_n: 1 new message in %1\n"
"%n new messages in %1"
msgstr ""
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
msgid ""
"_: %1 is a list of the number of new messages per folder\n"
"<b>New mail arrived</b>"
"<br>%1"
msgstr ""
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
msgid "New mail arrived"
msgstr ""
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
#, c-format
msgid "Properties of Folder %1"
msgstr ""
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
msgid "This folder does not have any expiry options set"
msgstr ""
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
msgstr ""
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
msgid "Expire Folder"
msgstr ""
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
msgid "&Expire"
msgstr ""
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
msgid "Move to Trash"
msgstr ""
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
msgid "Are you sure you want to empty the trash folder?"
msgstr ""
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
msgid ""
"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
"to the trash?</qt>"
msgstr ""
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
msgid "Moved all messages to the trash"
msgstr ""
-#: kmmainwidget.cpp:1220
+#: kmmainwidget.cpp:1200
+msgid ""
+"It is not possible to delete this folder right now because it is being "
+"syncronized. Please wait until the syncronization of this folder is complete "
+"and then try again."
+msgstr ""
+
+#: kmmainwidget.cpp:1203
+msgid "Unable to delete folder"
+msgstr ""
+
+#: kmmainwidget.cpp:1209
msgid "Delete Search"
msgstr ""
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
msgid ""
"<qt>Are you sure you want to delete the search <b>%1</b>?"
"<br>Any messages it shows will still be available in their original folder.</qt>"
msgstr ""
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
msgid "Delete Folder"
msgstr ""
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
msgstr ""
-#: kmmainwidget.cpp:1233
+#: kmmainwidget.cpp:1222
msgid ""
"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
"and all its subfolders? Those subfolders might not be empty and their contents "
@@ -6926,7 +7688,7 @@ msgid ""
"and are permanently deleted.</qt>"
msgstr ""
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
msgid ""
"<qt>Are you sure you want to delete the folder <b>%1</b>"
", discarding its contents? "
@@ -6934,7 +7696,7 @@ msgid ""
"and are permanently deleted.</qt>"
msgstr ""
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
msgid ""
"<qt>Are you sure you want to delete the folder <b>%1</b> "
"and all its subfolders, discarding their contents? "
@@ -6942,620 +7704,623 @@ msgid ""
"and are permanently deleted.</qt>"
msgstr ""
-#: kmmainwidget.cpp:1268
-msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
-"reset to the main Inbox folder.</qt>"
-msgstr ""
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
msgid ""
"Are you sure you want to refresh the IMAP cache?\n"
"This will remove all changes that you have done locally to your IMAP folders."
msgstr ""
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
msgid "Are you sure you want to expire all old messages?"
msgstr ""
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
msgid ""
"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
"the likelihood that your system will be compromised by other present and "
"anticipated security exploits."
msgstr ""
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
msgid "Security Warning"
msgstr ""
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
msgid "Use HTML"
msgstr ""
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
msgid ""
"Loading external references in html mail will make you more vulnerable to "
"\"spam\" and may increase the likelihood that your system will be compromised "
"by other present and anticipated security exploits."
msgstr ""
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
msgid "Load External References"
msgstr ""
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
msgid "Filter on Mailing-List..."
msgstr ""
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
msgid "Filter on Mailing-List %1..."
msgstr ""
-#: kmmainwidget.cpp:1761
+#: kmmainwidget.cpp:1738
msgid ""
"KMail's Out of Office Reply functionality relies on server-side filtering. You "
"have not yet configured an IMAP server for this.\n"
"You can do this on the \"Filtering\" tab of the IMAP account configuration."
msgstr ""
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
msgid "No Server-Side Filtering Configured"
msgstr ""
-#: kmmainwidget.cpp:1793
-msgid "Could not start certificate manager; please check your installation."
+#: kmmainwidget.cpp:1770
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
msgstr ""
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
msgid ""
"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
msgstr ""
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
msgid "Forward With Custom Template"
msgstr ""
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
msgid "Reply With Custom Template"
msgstr ""
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
msgid "Reply to All With Custom Template"
msgstr ""
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
msgid "(no custom templates)"
msgstr ""
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
msgid "Save &As..."
msgstr ""
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
msgid "&Compact All Folders"
msgstr ""
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
msgid "&Expire All Folders"
msgstr ""
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
msgid "&Refresh Local IMAP Cache"
msgstr ""
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
msgid "Empty All &Trash Folders"
msgstr ""
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
msgid "Check Mail in Favorite Folders"
msgstr ""
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
msgid "Check Mail &In"
msgstr ""
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
msgid "&Send Queued Messages"
msgstr ""
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
msgid "Online Status (unknown)"
msgstr ""
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
msgid "Send Queued Messages Via"
msgstr ""
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
msgid "&Address Book..."
msgstr ""
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
msgid "Certificate Manager..."
msgstr ""
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
msgid "GnuPG Log Viewer..."
msgstr ""
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
msgid "&Import Messages..."
msgstr ""
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
msgid "&Debug Sieve..."
msgstr ""
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
msgid "Edit \"Out of Office\" Replies..."
msgstr ""
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
msgid "Filter &Log Viewer..."
msgstr ""
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
msgid "&Anti-Spam Wizard..."
msgstr ""
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
msgid "&Anti-Virus Wizard..."
msgstr ""
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
msgid "&Move to Trash"
msgstr ""
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
msgid "Move message to trashcan"
msgstr ""
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
msgid "M&ove Thread to Trash"
msgstr ""
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
msgid "Move thread to trashcan"
msgstr ""
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
msgid "Delete T&hread"
msgstr ""
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
msgid "&Find Messages..."
msgstr ""
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
msgid "&Find in Message..."
msgstr ""
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
msgid "Select &All Messages"
msgstr ""
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
msgid "&Properties"
msgstr ""
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
msgid "&Mailing List Management..."
msgstr ""
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
msgid "Mark All Messages as &Read"
msgstr ""
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
msgid "&Expiration Settings"
msgstr ""
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
msgid "&Compact Folder"
msgstr ""
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
msgid "Check Mail &in This Folder"
msgstr ""
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+msgid "&Archive Folder..."
+msgstr ""
+
+#: kmmainwidget.cpp:2820
msgid "Prefer &HTML to Plain Text"
msgstr ""
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
msgid "Load E&xternal References"
msgstr ""
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
msgid "&Thread Messages"
msgstr ""
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
msgid "Thread Messages also by &Subject"
msgstr ""
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
msgid "Copy Folder"
msgstr ""
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
msgid "Cut Folder"
msgstr ""
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
msgid "Paste Folder"
msgstr ""
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
msgid "Copy Messages"
msgstr ""
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
msgid "Cut Messages"
msgstr ""
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
msgid "Paste Messages"
msgstr ""
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
msgid "&New Message..."
msgstr ""
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
msgid "New Message From &Template"
msgstr ""
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
msgid "New Message t&o Mailing-List..."
msgstr ""
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
msgid ""
"_: Message->\n"
"&Forward"
msgstr ""
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
msgid "&Inline..."
msgstr ""
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
msgid ""
"_: Message->Forward->\n"
"As &Attachment..."
msgstr ""
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
msgid ""
"_: Message->Forward->\n"
"As Di&gest..."
msgstr ""
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
msgid ""
"_: Message->Forward->\n"
"&Redirect..."
msgstr ""
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
msgid "Send A&gain..."
msgstr ""
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
msgid "&Create Filter"
msgstr ""
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
msgid "Filter on &Subject..."
msgstr ""
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
msgid "Filter on &From..."
msgstr ""
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
msgid "Filter on &To..."
msgstr ""
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
msgid "Filter on Mailing-&List..."
msgstr ""
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
msgid "Mark &Thread"
msgstr ""
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
msgid "Mark Thread as &Read"
msgstr ""
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
msgid "Mark all messages in the selected thread as read"
msgstr ""
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
msgid "Mark Thread as &New"
msgstr ""
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
msgid "Mark all messages in the selected thread as new"
msgstr ""
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
msgid "Mark Thread as &Unread"
msgstr ""
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
msgid "Mark all messages in the selected thread as unread"
msgstr ""
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
msgid "Mark Thread as &Important"
msgstr ""
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
msgid "Remove &Important Thread Mark"
msgstr ""
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
msgid "Mark Thread as &Action Item"
msgstr ""
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
msgid "Remove &Action Item Thread Mark"
msgstr ""
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
msgid "&Watch Thread"
msgstr ""
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
msgid "&Ignore Thread"
msgstr ""
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
msgid "Save A&ttachments..."
msgstr ""
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
msgid "Appl&y All Filters"
msgstr ""
-#. i18n: file kmail_part.rc line 141
-#: kmmainwidget.cpp:2985 rc.cpp:30 rc.cpp:96
+#. i18n: file kmail_part.rc line 142
+#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
#, no-c-format
msgid "A&pply Filter"
msgstr ""
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
msgid ""
"_: View->\n"
"&Unread Count"
msgstr ""
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
msgid "Choose how to display the count of unread messages"
msgstr ""
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
msgid ""
"_: View->Unread Count\n"
"View in &Separate Column"
msgstr ""
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
msgid ""
"_: View->Unread Count\n"
"View After &Folder Name"
msgstr ""
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
msgid ""
"_: View->\n"
"&Total Column"
msgstr ""
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
msgid ""
"Toggle display of column showing the total number of messages in folders."
msgstr ""
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
msgid ""
"_: View->\n"
"&Size Column"
msgstr ""
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
msgid "Toggle display of column showing the total size of messages in folders."
msgstr ""
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
msgid ""
"_: View->\n"
"&Expand Thread"
msgstr ""
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
msgid "Expand the current thread"
msgstr ""
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
msgid ""
"_: View->\n"
"&Collapse Thread"
msgstr ""
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
msgid "Collapse the current thread"
msgstr ""
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
msgid ""
"_: View->\n"
"Ex&pand All Threads"
msgstr ""
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
msgid "Expand all threads in the current folder"
msgstr ""
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
msgid ""
"_: View->\n"
"C&ollapse All Threads"
msgstr ""
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
msgid "Collapse all threads in the current folder"
msgstr ""
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
msgid "&View Source"
msgstr ""
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
msgid "&Display Message"
msgstr ""
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
msgid "&Next Message"
msgstr ""
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
msgid "Go to the next message"
msgstr ""
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
msgid "Next &Unread Message"
msgstr ""
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
msgid "Go to the next unread message"
msgstr ""
#. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
msgid "&Previous Message"
msgstr ""
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
msgid "Go to the previous message"
msgstr ""
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
msgid "Previous Unread &Message"
msgstr ""
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
msgid "Go to the previous unread message"
msgstr ""
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
msgid "Next Unread &Folder"
msgstr ""
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
msgid "Go to the next folder with unread messages"
msgstr ""
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
msgid "Previous Unread F&older"
msgstr ""
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
msgid "Go to the previous folder with unread messages"
msgstr ""
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
msgid ""
"_: Go->\n"
"Next Unread &Text"
msgstr ""
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
msgid "Go to the next unread text"
msgstr ""
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
msgid ""
"Scroll down current message. If at end of current message, go to next unread "
"message."
msgstr ""
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr ""
+
+#: kmmainwidget.cpp:3136
msgid "Configure &Filters..."
msgstr ""
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
msgid "Configure &POP Filters..."
msgstr ""
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
msgid "Manage &Sieve Scripts..."
msgstr ""
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
msgid "KMail &Introduction"
msgstr ""
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
msgid "Display KMail's Welcome Page"
msgstr ""
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
msgid "Configure &Notifications..."
msgstr ""
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
msgid "&Configure KMail..."
msgstr ""
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
msgid "E&mpty Trash"
msgstr ""
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
msgid "&Move All Messages to Trash"
msgstr ""
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
msgid "&Delete Search"
msgstr ""
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
msgid "&Delete Folder"
msgstr ""
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
#, c-format
msgid ""
"_n: Removed %n duplicate message.\n"
"Removed %n duplicate messages."
msgstr ""
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
msgid "No duplicate messages found."
msgstr ""
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
#, c-format
msgid "Filter %1"
msgstr ""
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
msgid "Subscription"
msgstr ""
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
msgid "Local Subscription"
msgstr ""
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
msgid "Out of office reply active"
msgstr ""
@@ -7567,7 +8332,7 @@ msgstr ""
msgid " Initializing..."
msgstr ""
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
msgid ""
"This message contains a request to return a notification about your reception "
"of the message.\n"
@@ -7575,7 +8340,7 @@ msgid ""
"response."
msgstr ""
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
msgid ""
"This message contains a request to send a notification about your reception of "
"the message.\n"
@@ -7584,7 +8349,7 @@ msgid ""
"You can either ignore the request or let KMail send a \"failed\" response."
msgstr ""
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
msgid ""
"This message contains a request to send a notification about your reception of "
"the message,\n"
@@ -7593,7 +8358,7 @@ msgid ""
"response."
msgstr ""
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
msgid ""
"This message contains a request to send a notification about your reception of "
"the message,\n"
@@ -7602,7 +8367,7 @@ msgid ""
"response."
msgstr ""
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
msgid ""
"This message contains a request to send a notification about your reception of "
"the message,\n"
@@ -7612,52 +8377,60 @@ msgid ""
"response."
msgstr ""
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
msgid "Message Disposition Notification Request"
msgstr ""
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
msgid "Send \"&denied\""
msgstr ""
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
msgid "&Send"
msgstr ""
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
msgid ""
"Header \"Disposition-Notification-Options\" contained required, but unknown "
"parameter"
msgstr ""
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
msgid "Receipt: "
msgstr ""
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
#, c-format
msgid "Attachment: %1"
msgstr ""
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+msgid "This attachment has been deleted."
+msgstr ""
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr ""
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
msgid ""
"_: to view something\n"
"View"
msgstr ""
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
msgid "Save All Attachments..."
msgstr ""
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
msgid "Delete Attachment"
msgstr ""
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
msgid "Edit Attachment"
msgstr ""
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
msgid "Unspecified Binary Data"
msgstr ""
@@ -7823,224 +8596,234 @@ msgstr ""
msgid "unknown"
msgstr ""
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
msgid "Save Attachments..."
msgstr ""
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
msgid ""
"_: View->\n"
"&Headers"
msgstr ""
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
msgid "Choose display style of message headers"
msgstr ""
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
msgid ""
"_: View->headers->\n"
"&Enterprise Headers"
msgstr ""
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
msgid "Show the list of headers in Enterprise style"
msgstr ""
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
msgid ""
"_: View->headers->\n"
"&Fancy Headers"
msgstr ""
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
msgid "Show the list of headers in a fancy format"
msgstr ""
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
msgid ""
"_: View->headers->\n"
"&Brief Headers"
msgstr ""
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
msgid "Show brief list of message headers"
msgstr ""
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
msgid ""
"_: View->headers->\n"
"&Standard Headers"
msgstr ""
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
msgid "Show standard list of message headers"
msgstr ""
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
msgid ""
"_: View->headers->\n"
"&Long Headers"
msgstr ""
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
msgid "Show long list of message headers"
msgstr ""
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
msgid ""
"_: View->headers->\n"
"&All Headers"
msgstr ""
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
msgid "Show all message headers"
msgstr ""
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
msgid ""
"_: View->\n"
"&Attachments"
msgstr ""
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
msgid "Choose display style of attachments"
msgstr ""
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
msgid ""
"_: View->attachments->\n"
"&As Icons"
msgstr ""
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
msgid "Show all attachments as icons. Click to see them."
msgstr ""
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
msgid ""
"_: View->attachments->\n"
"&Smart"
msgstr ""
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
msgid "Show attachments as suggested by sender."
msgstr ""
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
msgid ""
"_: View->attachments->\n"
"&Inline"
msgstr ""
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
msgid "Show all attachments inline (if possible)"
msgstr ""
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
msgid ""
"_: View->attachments->\n"
"&Hide"
msgstr ""
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
msgid "Do not show attachments in the message viewer"
msgstr ""
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr ""
+
+#: kmreaderwin.cpp:575
+msgid "Show Attachments only in the header of the mail"
+msgstr ""
+
+#: kmreaderwin.cpp:580
msgid "&Set Encoding"
msgstr ""
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
msgid "New Message To..."
msgstr ""
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
msgid "Reply To..."
msgstr ""
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
msgid "Forward To..."
msgstr ""
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
msgid "Add to Address Book"
msgstr ""
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
msgid "Open in Address Book"
msgstr ""
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
msgid "Select All Text"
msgstr ""
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
msgid "Copy Link Address"
msgstr ""
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
msgid "Open URL"
msgstr ""
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
msgid "Bookmark This Link"
msgstr ""
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
msgid "Save Link As..."
msgstr ""
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
msgid "Chat &With..."
msgstr ""
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
msgid "Full namespace support for IMAP"
msgstr ""
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
msgid "Offline mode"
msgstr ""
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
msgid "Sieve script management and editing"
msgstr ""
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
msgid "Account specific filtering"
msgstr ""
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
msgid "Filtering of incoming mail for online IMAP accounts"
msgstr ""
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
msgid "Online IMAP folders can be used when filtering into folders"
msgstr ""
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
msgid "Automatically delete older mails on POP servers"
msgstr ""
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+msgid "The email client for the Trinity Desktop Environment."
msgstr ""
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
msgid ""
"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
"<p>Please wait . . .</p>&nbsp;"
msgstr ""
-#: kmreaderwin.cpp:1354
+#: kmreaderwin.cpp:1318
msgid ""
"<h2 style='margin-top: 0px;'>Offline</h2>"
"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
"to go online . . .</p>&nbsp;"
msgstr ""
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
msgid ""
"_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
"version; %5: prior TDE version; %6: generated list of new features; %7: "
@@ -8066,12 +8849,12 @@ msgid ""
"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
msgstr ""
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
msgid ""
"<li>%1</li>\n"
msgstr ""
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
msgid ""
"<p>Please take a moment to fill in the KMail configuration panel at "
"Settings-&gt;Configure KMail.\n"
@@ -8079,79 +8862,87 @@ msgid ""
"outgoing mail account.</p>\n"
msgstr ""
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
msgid ""
"<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
"(compared to KMail %1):</p>\n"
msgstr ""
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
msgid "( body part )"
msgstr ""
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
msgid "Could not send MDN."
msgstr ""
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+msgid "Copy Email Address"
+msgstr ""
+
+#: kmreaderwin.cpp:2044
msgid "Decrypt With Chiasmus..."
msgstr ""
-#: kmreaderwin.cpp:2133 kmreaderwin.cpp:2169 kmreaderwin.cpp:2188
+#: kmreaderwin.cpp:2050
+msgid "Scroll To"
+msgstr ""
+
+#: kmreaderwin.cpp:2208 kmreaderwin.cpp:2244 kmreaderwin.cpp:2264
#, c-format
msgid "View Attachment: %1"
msgstr ""
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
#, c-format
msgid ""
"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
"[KMail: Attachment contains binary data. Trying to show first %n characters.]"
msgstr ""
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
msgid "&Open with '%1'"
msgstr ""
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
msgid "&Open With..."
msgstr ""
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
msgid ""
"Open attachment '%1'?\n"
"Note that opening an attachment may compromise your system's security."
msgstr ""
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
msgid "Open Attachment?"
msgstr ""
-#: kmreaderwin.cpp:2625
+#: kmreaderwin.cpp:2804
msgid ""
"Deleting an attachment might invalidate any digital signature on this message."
msgstr ""
-#: kmreaderwin.cpp:2637
+#: kmreaderwin.cpp:2860
msgid ""
"Modifying an attachment might invalidate any digital signature on this message."
msgstr ""
-#: kmreaderwin.cpp:2685
+#: kmreaderwin.cpp:2956
msgid "Attachments:"
msgstr ""
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
msgid ""
"_: name used for a virgin filter\n"
"unknown"
msgstr ""
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
msgid "(match any of the following)"
msgstr ""
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
msgid "(match all of the following)"
msgstr ""
@@ -8183,33 +8974,49 @@ msgstr ""
msgid "Message Status"
msgstr ""
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+msgid "From"
+msgstr ""
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr ""
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr ""
+
+#: kmsearchpatternedit.cpp:45
+msgid "Reply To"
+msgstr ""
+
+#: kmsearchpatternedit.cpp:46
+msgid "Organization"
+msgstr ""
+
+#: kmsearchpatternedit.cpp:397
msgid "Search Criteria"
msgstr ""
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
msgid "Match a&ll of the following"
msgstr ""
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
msgid "Match an&y of the following"
msgstr ""
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr ""
-
#: kmsender.cpp:171
msgid "Cannot add message to outbox folder"
msgstr ""
-#: kmsender.cpp:373
+#: kmsender.cpp:374
msgid ""
"Critical error: Unable to process sent mail (out of space?)Moving failing "
"message to \"sent-mail\" folder."
msgstr ""
-#: kmsender.cpp:385
+#: kmsender.cpp:386
msgid ""
"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
"failed.\n"
@@ -8217,57 +9024,57 @@ msgid ""
"the problem and move the message manually."
msgstr ""
-#: kmsender.cpp:431
+#: kmsender.cpp:432
msgid ""
"It's not possible to send messages without specifying a sender address.\n"
"Please set the email address of identity '%1' in the Identities section of the "
"configuration dialog and then try again."
msgstr ""
-#: kmsender.cpp:453
+#: kmsender.cpp:454
#, c-format
msgid ""
"_n: %n queued message successfully sent.\n"
"%n queued messages successfully sent."
msgstr ""
-#: kmsender.cpp:456
+#: kmsender.cpp:457
msgid "%1 of %2 queued messages successfully sent."
msgstr ""
-#: kmsender.cpp:471
+#: kmsender.cpp:472
msgid "Sending messages"
msgstr ""
-#: kmsender.cpp:472
+#: kmsender.cpp:473
msgid "Initiating sender process..."
msgstr ""
-#: kmsender.cpp:502
+#: kmsender.cpp:503
msgid ""
"You have chosen to send all queued email using an unencrypted transport, do you "
"want to continue? "
msgstr ""
-#: kmsender.cpp:504
+#: kmsender.cpp:505
msgid "Send Unencrypted"
msgstr ""
-#: kmsender.cpp:556
+#: kmsender.cpp:557
msgid "Unrecognized transport protocol. Unable to send message."
msgstr ""
-#: kmsender.cpp:597
+#: kmsender.cpp:598
msgid ""
"_: %3: subject of message\n"
"Sending message %1 of %2: %3"
msgstr ""
-#: kmsender.cpp:616
+#: kmsender.cpp:617
msgid "Failed to send (some) queued messages."
msgstr ""
-#: kmsender.cpp:693
+#: kmsender.cpp:694
msgid ""
"Sending aborted:\n"
"%1\n"
@@ -8277,11 +9084,11 @@ msgid ""
" %2"
msgstr ""
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
msgid "Sending aborted."
msgstr ""
-#: kmsender.cpp:719
+#: kmsender.cpp:720
msgid ""
"<p>Sending failed:</p>"
"<p>%1</p>"
@@ -8292,19 +9099,19 @@ msgid ""
"<p>Do you want me to continue sending the remaining messages?</p>"
msgstr ""
-#: kmsender.cpp:729
+#: kmsender.cpp:730
msgid "Continue Sending"
msgstr ""
-#: kmsender.cpp:729
+#: kmsender.cpp:730
msgid "&Continue Sending"
msgstr ""
-#: kmsender.cpp:730
+#: kmsender.cpp:731
msgid "&Abort Sending"
msgstr ""
-#: kmsender.cpp:732
+#: kmsender.cpp:733
msgid ""
"Sending failed:\n"
"%1\n"
@@ -8314,11 +9121,11 @@ msgid ""
" %2"
msgstr ""
-#: kmsender.cpp:930
+#: kmsender.cpp:931
msgid "Please specify a mailer program in the settings."
msgstr ""
-#: kmsender.cpp:931
+#: kmsender.cpp:932
msgid ""
"Sending failed:\n"
"%1\n"
@@ -8328,65 +9135,65 @@ msgid ""
" %2"
msgstr ""
-#: kmsender.cpp:979
+#: kmsender.cpp:980
#, c-format
msgid "Failed to execute mailer program %1"
msgstr ""
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
msgid "Sendmail exited abnormally."
msgstr ""
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
msgid "You need to supply a username and a password to use this SMTP server."
msgstr ""
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
msgid ""
"%1 already seems to be running on another display on this machine. Running %2 "
"more than once can cause the loss of mail. You should not start %1 unless you "
"are sure that it is not already running."
msgstr ""
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
msgid ""
"%1 seems to be running on another display on this machine. Running %1 and %2 at "
"the same time can cause the loss of mail. You should not start %2 unless you "
"are sure that %1 is not running."
msgstr ""
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
msgid ""
"%1 already seems to be running on %2. Running %1 more than once can cause the "
"loss of mail. You should not start %1 on this computer unless you are sure that "
"it is not already running on %2."
msgstr ""
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
msgid ""
"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
"loss of mail. You should not start %2 on this computer unless you are sure that "
"%1 is not running on %3."
msgstr ""
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
#, c-format
msgid "Start %1"
msgstr ""
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
msgid "Exit"
msgstr ""
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
msgid "New Messages In"
msgstr ""
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
msgid "There are no unread messages"
msgstr ""
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
#, c-format
msgid ""
"_n: There is 1 unread message.\n"
@@ -8637,51 +9444,55 @@ msgstr ""
msgid "Available Scripts"
msgstr ""
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
msgid "No Sieve URL configured"
msgstr ""
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
msgid "Failed to fetch the list of scripts"
msgstr ""
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
msgid "Delete Script"
msgstr ""
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
msgid "Edit Script..."
msgstr ""
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+msgid "Deactivate Script"
+msgstr ""
+
+#: managesievescriptsdialog.cpp:170
msgid "New Script..."
msgstr ""
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
msgid "Really delete script \"%1\" from the server?"
msgstr ""
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
msgid "Delete Sieve Script Confirmation"
msgstr ""
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
msgid "New Sieve Script"
msgstr ""
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
msgid "Please enter a name for the new Sieve script:"
msgstr ""
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
msgid "Edit Sieve Script"
msgstr ""
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
msgid "The Sieve script was successfully uploaded."
msgstr ""
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
msgid "Sieve Script Upload"
msgstr ""
@@ -8691,7 +9502,7 @@ msgid ""
"&Reply"
msgstr ""
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
msgid "&Reply..."
msgstr ""
@@ -8699,11 +9510,11 @@ msgstr ""
msgid "Reply to A&uthor..."
msgstr ""
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
msgid "Reply to &All..."
msgstr ""
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
msgid "Reply to Mailing-&List..."
msgstr ""
@@ -8763,7 +9574,7 @@ msgstr ""
msgid "&Edit Message"
msgstr ""
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
msgid ""
"<qt>"
"<p>Structuring information returned by the Crypto plug-in could not be "
@@ -8771,7 +9582,7 @@ msgid ""
"<p>Please contact your system administrator.</p></qt>"
msgstr ""
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
msgid ""
"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
"successfully.</p>"
@@ -8783,174 +9594,174 @@ msgid ""
"Identity->Advanced tab.</li></ul>"
msgstr ""
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
msgid ""
"No suitable encoding could be found for your message.\n"
"Please set an encoding using the 'Options' menu."
msgstr ""
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
msgid ""
"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
"bug."
msgstr ""
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
msgid ""
"The \"x-encrypt\" function does not accept the expected parameters. Please "
"report this bug."
msgstr ""
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
msgid "Chiasmus Encryption Error"
msgstr ""
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
msgid ""
"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
"not return a byte array. Please report this bug."
msgstr ""
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
msgid ""
"The inline OpenPGP crypto message format does not support encryption or signing "
"of attachments.\n"
"Really use deprecated inline OpenPGP?"
msgstr ""
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
msgid "Insecure Message Format"
msgstr ""
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
msgid "Use Inline OpenPGP"
msgstr ""
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
msgid "Use OpenPGP/MIME"
msgstr ""
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
msgid ""
"Examination of the recipient's signing preferences yielded that you be asked "
"whether or not to sign this message.\n"
"Sign this message?"
msgstr ""
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
msgid "Sign Message?"
msgstr ""
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
msgid ""
"_: to sign\n"
"&Sign"
msgstr ""
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
msgid "Do &Not Sign"
msgstr ""
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
msgid ""
"There are conflicting signing preferences for these recipients.\n"
"Sign this message?"
msgstr ""
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
msgid ""
"You have requested to sign this message, but no valid signing keys have been "
"configured for this identity."
msgstr ""
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
msgid "Send Unsigned?"
msgstr ""
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
msgid "Send &Unsigned"
msgstr ""
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
msgid ""
"Some parts of this message will not be signed.\n"
"Sending only partially signed messages might violate site policy.\n"
"Sign all parts instead?"
msgstr ""
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
msgid ""
"This message will not be signed.\n"
"Sending unsigned message might violate site policy.\n"
"Sign message instead?"
msgstr ""
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
msgid "&Sign All Parts"
msgstr ""
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
msgid "&Sign"
msgstr ""
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
msgid "Unsigned-Message Warning"
msgstr ""
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
msgid "Send &As Is"
msgstr ""
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
msgid ""
"Valid trusted encryption keys were found for all recipients.\n"
"Encrypt this message?"
msgstr ""
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
msgid ""
"Examination of the recipient's encryption preferences yielded that you be asked "
"whether or not to encrypt this message.\n"
"Encrypt this message?"
msgstr ""
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
msgid "Encrypt Message?"
msgstr ""
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
msgid "Sign && &Encrypt"
msgstr ""
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
msgid "&Sign Only"
msgstr ""
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
msgid "&Send As-Is"
msgstr ""
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
msgid ""
"There are conflicting encryption preferences for these recipients.\n"
"Encrypt this message?"
msgstr ""
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
msgid "Do &Not Encrypt"
msgstr ""
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
msgid ""
"You have requested to encrypt this message, and to encrypt a copy to yourself, "
"but no valid trusted encryption keys have been configured for this identity."
msgstr ""
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
msgid "Send Unencrypted?"
msgstr ""
-#: messagecomposer.cpp:948
+#: messagecomposer.cpp:946
msgid ""
"Some parts of this message will not be encrypted.\n"
"Sending only partially encrypted messages might violate site policy and/or leak "
@@ -8958,7 +9769,7 @@ msgid ""
"Encrypt all parts instead?"
msgstr ""
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
msgid ""
"This message will not be encrypted.\n"
"Sending unencrypted messages might violate site policy and/or leak sensitive "
@@ -8966,15 +9777,15 @@ msgid ""
"Encrypt messages instead?"
msgstr ""
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
msgid "&Encrypt All Parts"
msgstr ""
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
msgid "Unencrypted Message Warning"
msgstr ""
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
msgid ""
"<qt>"
"<p>Error: The backend did not return any encoded data.</p>"
@@ -8982,76 +9793,82 @@ msgid ""
"<br>%2</p></qt>"
msgstr ""
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
msgid ""
"<qt>Not all characters fit into the chosen encoding."
"<br>"
"<br>Send the message anyway?</qt>"
msgstr ""
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
msgid "Some Characters Will Be Lost"
msgstr ""
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
msgid "Lose Characters"
msgstr ""
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
msgid "Change Encoding"
msgstr ""
-#: messagecomposer.cpp:2164
+#: messagecomposer.cpp:2149
+msgid ""
+"This message could not be signed, since no valid signing keys have been found; "
+"this should actually never happen, please report this bug."
+msgstr ""
+
+#: messagecomposer.cpp:2168
msgid ""
"This message could not be signed, since the chosen backend does not seem to "
"support signing; this should actually never happen, please report this bug."
msgstr ""
-#: messagecomposer.cpp:2185
+#: messagecomposer.cpp:2195
msgid "GnuPG Audit Log for Signing Operation"
msgstr ""
-#: messagecomposer.cpp:2190
+#: messagecomposer.cpp:2200
msgid ""
"The signing operation failed. Please make sure that the gpg-agent program is "
"running."
msgstr ""
-#: messagecomposer.cpp:2213
+#: messagecomposer.cpp:2223
msgid ""
"This message could not be encrypted, since the chosen backend does not seem to "
"support encryption; this should actually never happen, please report this bug."
msgstr ""
-#: messagecomposer.cpp:2233 messagecomposer.cpp:2278
+#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
msgid "GnuPG Audit Log for Encryption Operation"
msgstr ""
-#: messagecomposer.cpp:2255
+#: messagecomposer.cpp:2271
msgid ""
"This message could not be signed and encrypted, since the chosen backend does "
"not seem to support combined signing and encryption; this should actually never "
"happen, please report this bug."
msgstr ""
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
msgid "New Folder"
msgstr ""
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
#, c-format
msgid "New Subfolder of %1"
msgstr ""
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
msgid "Enter a name for the new folder."
msgstr ""
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
msgid "Mailbox &format:"
msgstr ""
-#: newfolderdialog.cpp:97
+#: newfolderdialog.cpp:101
msgid ""
"Select whether you want to store the messages in this folder as one file per "
"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
@@ -9059,131 +9876,117 @@ msgid ""
"this option as-is."
msgstr ""
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
msgid "Folder &contains:"
msgstr ""
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
msgid ""
"Select whether you want the new folder to be used for mail storage of for "
"storage of groupware items such as tasks or notes. The default is mail. If you "
"are unsure, leave this option as-is."
msgstr ""
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
msgid "Namespace for &folder:"
msgstr ""
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
msgid "Select the personal namespace the folder should be created in."
msgstr ""
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
msgid "Please specify a name for the new folder."
msgstr ""
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
msgid "No Name Specified"
msgstr ""
-#: newfolderdialog.cpp:198
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:204
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:223
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
msgstr ""
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
msgstr ""
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
msgid "Wrong Crypto Plug-In."
msgstr ""
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
msgid "Different results for signatures"
msgstr ""
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
msgid "The crypto engine returned no cleartext data."
msgstr ""
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
msgid "Status: "
msgstr ""
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
msgid "(unknown)"
msgstr ""
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
msgid "Crypto plug-in \"%1\" is not initialized."
msgstr ""
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
msgid "Crypto plug-in \"%1\" cannot verify signatures."
msgstr ""
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
msgid "No appropriate crypto plug-in was found."
msgstr ""
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
msgid ""
"_: %1 is either 'OpenPGP' or 'S/MIME'\n"
"No %1 plug-in was found."
msgstr ""
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
#, c-format
msgid ""
"The message is signed, but the validity of the signature cannot be verified.<br "
"/>Reason: %1"
msgstr ""
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+msgid "Encrypted data not shown"
+msgstr ""
+
+#: objecttreeparser.cpp:755
msgid "This message is encrypted."
msgstr ""
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
msgid "Decrypt Message"
msgstr ""
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
msgid "Encrypted data not shown."
msgstr ""
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
msgid "Crypto plug-in \"%1\" could not decrypt the data."
msgstr ""
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
#, c-format
msgid "Error: %1"
msgstr ""
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
msgid "Crypto plug-in \"%1\" cannot decrypt messages."
msgstr ""
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
msgid ""
"<b>Note:</b> This HTML message may contain external references to images etc. "
"For security/privacy reasons external references are not loaded. If you trust "
@@ -9191,7 +9994,7 @@ msgid ""
"message <a href=\"kmail:loadExternal\">by clicking here</a>."
msgstr ""
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
msgid ""
"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
"code is shown. If you trust the sender of this message then you can activate "
@@ -9199,312 +10002,335 @@ msgid ""
"by clicking here</a>."
msgstr ""
-#: objecttreeparser.cpp:1451
+#: objecttreeparser.cpp:1227
+msgid ""
+"This message is a <i>Toltec</i> Groupware object, it can only be viewed with "
+"Microsoft Outlook in combination with the Toltec connector."
+msgstr ""
+
+#: objecttreeparser.cpp:1239
+msgid "Show Raw Message"
+msgstr ""
+
+#: objecttreeparser.cpp:1658
#, c-format
msgid "Sorry, certificate could not be imported.<br>Reason: %1"
msgstr ""
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
msgid "Sorry, no certificates were found in this message."
msgstr ""
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
msgid "Certificate import status:"
msgstr ""
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
#, c-format
msgid ""
"_n: 1 new certificate was imported.\n"
"%n new certificates were imported."
msgstr ""
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
#, c-format
msgid ""
"_n: 1 certificate was unchanged.\n"
"%n certificates were unchanged."
msgstr ""
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
#, c-format
msgid ""
"_n: 1 new secret key was imported.\n"
"%n new secret keys were imported."
msgstr ""
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
#, c-format
msgid ""
"_n: 1 secret key was unchanged.\n"
"%n secret keys were unchanged."
msgstr ""
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
msgid "Sorry, no details on certificate import available."
msgstr ""
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
msgid "Certificate import details:"
msgstr ""
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
msgid "Failed: %1 (%2)"
msgstr ""
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
msgid "New or changed: %1 (secret key available)"
msgstr ""
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
#, c-format
msgid "New or changed: %1"
msgstr ""
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
msgid "Error: Signature not verified"
msgstr ""
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
msgid "Good signature"
msgstr ""
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
msgid "<b>Bad</b> signature"
msgstr ""
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
msgid "No public key to verify the signature"
msgstr ""
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
msgid "No signature found"
msgstr ""
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
msgid "Error verifying the signature"
msgstr ""
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
msgid "No status information available."
msgstr ""
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
msgid "Good signature."
msgstr ""
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
msgid "One key has expired."
msgstr ""
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
msgid "The signature has expired."
msgstr ""
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
msgid "Unable to verify: key missing."
msgstr ""
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
msgid "CRL not available."
msgstr ""
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
msgid "Available CRL is too old."
msgstr ""
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
msgid "A policy was not met."
msgstr ""
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
msgid "A system error occurred."
msgstr ""
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
msgid "One key has been revoked."
msgstr ""
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
msgid "<b>Bad</b> signature."
msgstr ""
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
msgid "Invalid signature."
msgstr ""
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
msgid "Not enough information to check signature validity."
msgstr ""
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
msgid "Signature is valid."
msgstr ""
-#: objecttreeparser.cpp:2062
+#: objecttreeparser.cpp:2283
msgid "Signed by <a href=\"mailto:%1\">%2</a>."
msgstr ""
-#: objecttreeparser.cpp:2066
+#: objecttreeparser.cpp:2287
msgid "Unknown signature state"
msgstr ""
-#: objecttreeparser.cpp:2070
+#: objecttreeparser.cpp:2291
msgid "Show Details"
msgstr ""
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
msgid "No Audit Log available"
msgstr ""
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr ""
+
+#: objecttreeparser.cpp:2320
msgid ""
"_: The Audit Log is a detailed error log from the gnupg backend\n"
"Show Audit Log"
msgstr ""
-#: objecttreeparser.cpp:2097
+#: objecttreeparser.cpp:2331
msgid "Hide Details"
msgstr ""
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
msgid "Encapsulated message"
msgstr ""
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+msgid "Please wait while the message is being decrypted..."
+msgstr ""
+
+#: objecttreeparser.cpp:2370
msgid "Encrypted message"
msgstr ""
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
msgid "Encrypted message (decryption not possible)"
msgstr ""
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
#, c-format
msgid "Reason: %1"
msgstr ""
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+msgid "Please wait while the signature is being verified..."
+msgstr ""
+
+#: objecttreeparser.cpp:2438
msgid "[Details]"
msgstr ""
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
msgid "certificate"
msgstr ""
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
msgid "Warning:"
msgstr ""
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
msgid "Sender's mail address is not stored in the %1 used for signing."
msgstr ""
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
msgid "sender: "
msgstr ""
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
msgid "stored: "
msgstr ""
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
msgid ""
"No mail address is stored in the %1 used for signing, so we cannot compare it "
"to the sender's address %2."
msgstr ""
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
#, c-format
msgid "Not enough information to check signature. %1"
msgstr ""
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
msgid "Message was signed with unknown key."
msgstr ""
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
#, c-format
msgid "Message was signed by %1."
msgstr ""
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
#, c-format
msgid "Message was signed with key %1."
msgstr ""
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
msgid "Message was signed on %1 with key %2."
msgstr ""
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
msgid "Message was signed by %3 on %1 with key %2"
msgstr ""
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
msgid "Message was signed by %2 with key %1."
msgstr ""
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
msgid "Message was signed on %1 with unknown key %2."
msgstr ""
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
#, c-format
msgid "Message was signed with unknown key %1."
msgstr ""
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
msgid "The validity of the signature cannot be verified."
msgstr ""
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
msgid "Message was signed by %2 (Key ID: %1)."
msgstr ""
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
msgid "The signature is valid, but the key's validity is unknown."
msgstr ""
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
msgid "The signature is valid and the key is marginally trusted."
msgstr ""
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
msgid "The signature is valid and the key is fully trusted."
msgstr ""
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
msgid "The signature is valid and the key is ultimately trusted."
msgstr ""
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
msgid "The signature is valid, but the key is untrusted."
msgstr ""
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
msgid "Warning: The signature is bad."
msgstr ""
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
msgid "End of signed message"
msgstr ""
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
msgid "End of encrypted message"
msgstr ""
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
msgid "End of encapsulated message"
msgstr ""
-#: partNode.cpp:481
+#: partNode.cpp:505
msgid "internal part"
msgstr ""
-#: partNode.cpp:483
+#: partNode.cpp:507
msgid "body part"
msgstr ""
@@ -9580,19 +10406,19 @@ msgstr ""
msgid "F&older"
msgstr ""
-#. i18n: file kmail_part.rc line 115
+#. i18n: file kmail_part.rc line 116
#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
#, no-c-format
msgid "&Message"
msgstr ""
-#. i18n: file kmail_part.rc line 121
+#. i18n: file kmail_part.rc line 122
#: rc.cpp:24 rc.cpp:90 rc.cpp:123
#, no-c-format
msgid "Reply Special"
msgstr ""
-#. i18n: file kmail_part.rc line 127
+#. i18n: file kmail_part.rc line 128
#: rc.cpp:27 rc.cpp:93 rc.cpp:126
#, no-c-format
msgid "&Forward"
@@ -9727,158 +10553,170 @@ msgstr ""
msgid "Never sign/encrypt when sa&ving as draft"
msgstr ""
-#. i18n: file customtemplates_base.ui line 180
-#: rc.cpp:194
+#. i18n: file customtemplates_base.ui line 118
+#: rc.cpp:194 rc.cpp:462
#, no-c-format
-msgid "Universal"
+msgid "How does this work?"
msgstr ""
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 169
+#: rc.cpp:197 templateparser.cpp:417
#, no-c-format
-msgid "Reply"
+msgid "To:"
msgstr ""
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
#, no-c-format
-msgid "Reply to All"
+msgid "CC:"
msgstr ""
-#. i18n: file customtemplates_base.ui line 195
+#. i18n: file customtemplates_base.ui line 234
#: rc.cpp:203
#, no-c-format
-msgid "Forward"
+msgid "Universal"
msgstr ""
-#. i18n: file customtemplates_base.ui line 207
+#. i18n: file customtemplates_base.ui line 239
#: rc.cpp:206
#, no-c-format
-msgid "Shortc&ut:"
+msgid "Reply"
msgstr ""
-#. i18n: file customtemplates_base.ui line 229
+#. i18n: file customtemplates_base.ui line 244
#: rc.cpp:209
#, no-c-format
-msgid "&Template type:"
+msgid "Reply to All"
msgstr ""
-#. i18n: file customtemplates_base.ui line 256
-#: rc.cpp:215 rc.cpp:456
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
#, no-c-format
-msgid "How does this work?"
+msgid "Forward"
msgstr ""
-#. i18n: file folderpropertiesdialog.ui line 16
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
+#, no-c-format
+msgid "Shortc&ut:"
+msgstr ""
+
+#. i18n: file customtemplates_base.ui line 283
#: rc.cpp:218
#, no-c-format
+msgid "&Template type:"
+msgstr ""
+
+#. i18n: file folderpropertiesdialog.ui line 16
+#: rc.cpp:224
+#, no-c-format
msgid "Folder Properties"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
#, no-c-format
msgid "Folder holds a &mailing list"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
#, no-c-format
msgid "List &address:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
#, no-c-format
msgid "N&ormal:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
#, no-c-format
msgid "Unr&ead:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
#, no-c-format
msgid "Message Expiring"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
#, no-c-format
msgid "E&xpire after:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
#, no-c-format
msgid "Expire &read messages"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
#, no-c-format
msgid "Expire a&fter:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
#, no-c-format
msgid "Expire &unread messages"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:257 rc.cpp:266
+#: rc.cpp:263 rc.cpp:272
#, no-c-format
msgid "Day(s)"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
#, no-c-format
msgid "Week(s)"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
#, no-c-format
msgid "Month(s)"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
#, no-c-format
msgid "Advanced"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
#, no-c-format
msgid "Sender identit&y:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
#, no-c-format
msgid "&Storage format:"
msgstr ""
#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
#, no-c-format
msgid "&List displays:"
msgstr ""
#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
#, no-c-format
msgid "Validate certificates using CRLs"
msgstr ""
#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
#, no-c-format
msgid ""
"If this option is selected, S/MIME certificates are validated using Certificate "
@@ -9886,13 +10724,13 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
#, no-c-format
msgid "Validate certificates online (OCSP)"
msgstr ""
#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
#, no-c-format
msgid ""
"If this option is selected, S/MIME certificates are validated online using the "
@@ -9901,19 +10739,19 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
#, no-c-format
msgid "Online Certificate Validation"
msgstr ""
#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
#, no-c-format
msgid "OCSP responder URL:"
msgstr ""
#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
#, no-c-format
msgid ""
"Enter here the address of the server for online validation of certificates "
@@ -9921,25 +10759,25 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
#, no-c-format
msgid "OCSP responder signature:"
msgstr ""
#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
#, no-c-format
msgid "Ignore service URL of certificates"
msgstr ""
#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
#, no-c-format
msgid "Do not check certificate policies"
msgstr ""
#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
#, no-c-format
msgid ""
"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -9947,13 +10785,13 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
#, no-c-format
msgid "Never consult a CRL"
msgstr ""
#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
#, no-c-format
msgid ""
"If this option is checked, Certificate Revocation Lists are never used to "
@@ -9961,13 +10799,13 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
#, no-c-format
msgid "Fetch missing issuer certificates"
msgstr ""
#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
#, no-c-format
msgid ""
"If this option is checked, missing issuer certificates are fetched when "
@@ -9975,37 +10813,37 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
#, no-c-format
msgid "HTTP Requests"
msgstr ""
#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
#, no-c-format
msgid "Do not perform any HTTP requests"
msgstr ""
#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: rc.cpp:350
#, no-c-format
msgid "Entirely disables the use of HTTP for S/MIME."
msgstr ""
#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:350
+#: rc.cpp:356
#, no-c-format
msgid "Use this proxy for HTTP requests: "
msgstr ""
#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
#, no-c-format
msgid "Use system HTTP proxy:"
msgstr ""
#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
#, no-c-format
msgid ""
"If this option is selected, the value of the HTTP proxy shown on the right "
@@ -10014,7 +10852,7 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
#, no-c-format
msgid ""
"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -10023,13 +10861,13 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:362
+#: rc.cpp:368
#, no-c-format
msgid "Ignore HTTP CRL distribution point of certificates"
msgstr ""
#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
#, no-c-format
msgid ""
"When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10040,31 +10878,31 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
#, no-c-format
msgid "LDAP Requests"
msgstr ""
#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
#, no-c-format
msgid "Do not perform any LDAP requests"
msgstr ""
#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: rc.cpp:380
#, no-c-format
msgid "Entirely disables the use of LDAP for S/MIME."
msgstr ""
#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:377
+#: rc.cpp:383
#, no-c-format
msgid "Ignore LDAP CRL distribution point of certificates"
msgstr ""
#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
#, no-c-format
msgid ""
"When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10075,13 +10913,13 @@ msgid ""
msgstr ""
#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
#, no-c-format
msgid "Primary host for LDAP requests:"
msgstr ""
#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
#, no-c-format
msgid ""
"Entering a LDAP server here will make all LDAP requests go to that server "
@@ -10094,86 +10932,86 @@ msgid ""
msgstr ""
#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:390
+#: rc.cpp:396
#, no-c-format
msgid "Add Snippet"
msgstr ""
#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:393
+#: rc.cpp:399
#, no-c-format
msgid "&Add"
msgstr ""
#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:402
+#: rc.cpp:408
#, no-c-format
msgid "&Snippet:"
msgstr ""
#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:405
+#: rc.cpp:411
#, no-c-format
msgid "Group:"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
#, no-c-format
msgid "Snippet Settings"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:411
+#: rc.cpp:417
#, no-c-format
msgid "Tooltips"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:414
+#: rc.cpp:420
#, no-c-format
msgid "Show snippet's text in &tooltip"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:417
+#: rc.cpp:423
#, no-c-format
msgid ""
"Decides if a tooltip should be shown containing text from the bookmarked line"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:420
+#: rc.cpp:426
#, no-c-format
msgid "Variables"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:423
+#: rc.cpp:429
#, no-c-format
msgid "Input Method for Variables"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:426
+#: rc.cpp:432
#, no-c-format
msgid "Single dialog for each variable within a snippet"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:429
+#: rc.cpp:435
#, no-c-format
msgid "An input dialog will be displayed for every variable within a snippet"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:432
+#: rc.cpp:438
#, no-c-format
msgid "One dialog for all variables within a snippet"
msgstr ""
#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:435
+#: rc.cpp:441
#, no-c-format
msgid ""
"A single dialog will be displayed where you can enter the values for all "
@@ -10181,49 +11019,49 @@ msgid ""
msgstr ""
#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
#, no-c-format
msgid "Delimiter:"
msgstr ""
#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
#, no-c-format
msgid "TemplatesConfiguration"
msgstr ""
#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
#, no-c-format
msgid "Reply to Sender"
msgstr ""
#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
#, no-c-format
msgid "Reply to All / Reply to List"
msgstr ""
#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
#, no-c-format
msgid "Forward Message"
msgstr ""
#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
#, no-c-format
msgid "Warn when trying to send &unsigned messages"
msgstr ""
#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
#, no-c-format
msgid "Check to be warned when sending unsigned messages."
msgstr ""
#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
#, no-c-format
msgid ""
"<qt>\n"
@@ -10236,19 +11074,19 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
#, no-c-format
msgid "&Warn when trying to send unencrypted messages"
msgstr ""
#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
#, no-c-format
msgid "Check to be warned when sending unencrypted messages."
msgstr ""
#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
#, no-c-format
msgid ""
"<qt>\n"
@@ -10261,19 +11099,19 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:490
+#: rc.cpp:496
#, no-c-format
msgid "Warn if &Receiver's Email Address is Not in Certificate"
msgstr ""
#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:493
+#: rc.cpp:499
#, no-c-format
msgid "Check to be warned if the address is not in the certificate"
msgstr ""
#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
#, no-c-format
msgid ""
"<qt>\n"
@@ -10286,38 +11124,38 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
#, no-c-format
msgid "Warn if certificates/keys expire soon (configure thresholds below)"
msgstr ""
#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
#, no-c-format
msgid "For signing"
msgstr ""
#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
#, no-c-format
msgid "For encryption"
msgstr ""
#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:513 rc.cpp:527 rc.cpp:541 rc.cpp:555 rc.cpp:569 rc.cpp:583
+#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
#: rulewidgethandlermanager.cpp:1437
#, no-c-format
msgid " days"
msgstr ""
#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
#, no-c-format
msgid "Select the number of days here"
msgstr ""
#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
#, no-c-format
msgid ""
"<qt>\n"
@@ -10330,7 +11168,7 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
#, no-c-format
msgid ""
"<qt>\n"
@@ -10343,7 +11181,7 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
#, no-c-format
msgid ""
"<qt>\n"
@@ -10356,7 +11194,7 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
#, no-c-format
msgid ""
"<qt>\n"
@@ -10369,7 +11207,7 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
#, no-c-format
msgid ""
"<qt>\n"
@@ -10382,55 +11220,55 @@ msgid ""
msgstr ""
#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
#, no-c-format
msgid "For root certificates:"
msgstr ""
#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
#, no-c-format
msgid "For intermediate CA certificates:"
msgstr ""
#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
#, no-c-format
msgid "For end-user certificates/keys:"
msgstr ""
#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: rc.cpp:612
#, no-c-format
msgid "Re-enable All \"Don't Ask Again\" Warnings"
msgstr ""
#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
#, no-c-format
msgid "Template content"
msgstr ""
#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
#, no-c-format
msgid "Template shortcut"
msgstr ""
#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
#, no-c-format
msgid "Template type"
msgstr ""
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. i18n: file kmail.kcfg line 61
+#: rc.cpp:624
#, no-c-format
msgid "Send queued mail on mail check"
msgstr ""
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
#, no-c-format
msgid ""
"<qt>"
@@ -10439,16 +11277,16 @@ msgid ""
"automatically at all. </p></qt>"
msgstr ""
-#. i18n: file kmail.kcfg line 70
-#: rc.cpp:624
+#. i18n: file kmail.kcfg line 72
+#: rc.cpp:630
#, no-c-format
msgid ""
"Automatically move non-synced mails from folders with insufficient access "
"rights"
msgstr ""
-#. i18n: file kmail.kcfg line 71
-#: rc.cpp:627
+#. i18n: file kmail.kcfg line 73
+#: rc.cpp:633
#, no-c-format
msgid ""
"If there are new messages in a folder, which have not been uploaded to the "
@@ -10457,14 +11295,14 @@ msgid ""
"folder."
msgstr ""
-#. i18n: file kmail.kcfg line 76
-#: rc.cpp:630
+#. i18n: file kmail.kcfg line 78
+#: rc.cpp:636
#, no-c-format
msgid "Allow local flags in read-only folders"
msgstr ""
-#. i18n: file kmail.kcfg line 85
-#: rc.cpp:633
+#. i18n: file kmail.kcfg line 87
+#: rc.cpp:639
#, no-c-format
msgid ""
"This setting allows administrators to set a minimum delay between two mail "
@@ -10473,42 +11311,42 @@ msgid ""
"set here."
msgstr ""
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. i18n: file kmail.kcfg line 93
+#: rc.cpp:643
#, no-c-format
msgid "The most recently selected folder in the folder selection dialog."
msgstr ""
-#. i18n: file kmail.kcfg line 99
-#: rc.cpp:640
+#. i18n: file kmail.kcfg line 101
+#: rc.cpp:646
#, no-c-format
msgid ""
"Disregard the users umask setting and use \"read-write for the user only\" "
"instead"
msgstr ""
-#. i18n: file kmail.kcfg line 107
-#: rc.cpp:646
+#. i18n: file kmail.kcfg line 109
+#: rc.cpp:652
#, no-c-format
msgid "Policy for showing the system tray icon"
msgstr ""
-#. i18n: file kmail.kcfg line 115
-#: rc.cpp:649
+#. i18n: file kmail.kcfg line 117
+#: rc.cpp:655
#, no-c-format
msgid ""
"Close the application when the mainwindow is closed, even if there is a system "
"tray icon active."
msgstr ""
-#. i18n: file kmail.kcfg line 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
#, no-c-format
msgid "Verbose new mail notification"
msgstr ""
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. i18n: file kmail.kcfg line 122
+#: rc.cpp:661
#, no-c-format
msgid ""
"If this option is enabled then for each folder the number of newly arrived "
@@ -10516,40 +11354,40 @@ msgid ""
"simple 'New mail arrived' message."
msgstr ""
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
#, no-c-format
msgid "Specify e&ditor:"
msgstr ""
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. i18n: file kmail.kcfg line 130
+#: rc.cpp:667
#, no-c-format
msgid "Use e&xternal editor instead of composer"
msgstr ""
-#. i18n: file kmail.kcfg line 155
-#: rc.cpp:664
+#. i18n: file kmail.kcfg line 157
+#: rc.cpp:670
#, no-c-format
msgid ""
"The threshold for when to warn the user that a folder is nearing its quota "
"limit."
msgstr ""
-#. i18n: file kmail.kcfg line 164
-#: rc.cpp:667
+#. i18n: file kmail.kcfg line 166
+#: rc.cpp:673
#, no-c-format
msgid "Enable groupware functionality"
msgstr ""
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
#, no-c-format
msgid "Mangle From:/To: headers in replies to replies"
msgstr ""
-#. i18n: file kmail.kcfg line 171
-#: rc.cpp:673
+#. i18n: file kmail.kcfg line 173
+#: rc.cpp:679
#, no-c-format
msgid ""
"Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -10557,14 +11395,14 @@ msgid ""
"with Outlook users not being able to get your replies, try setting this option."
msgstr ""
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. i18n: file kmail.kcfg line 178
+#: rc.cpp:682
#, no-c-format
msgid "Send groupware invitations in the mail body"
msgstr ""
-#. i18n: file kmail.kcfg line 177
-#: rc.cpp:679
+#. i18n: file kmail.kcfg line 179
+#: rc.cpp:685
#, no-c-format
msgid ""
"Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -10573,16 +11411,34 @@ msgid ""
"option."
msgstr ""
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. i18n: file kmail.kcfg line 184
+#: rc.cpp:688
#, no-c-format
msgid "Exchange compatible invitations naming"
msgstr ""
-#. i18n: file kmail.kcfg line 189
+#. i18n: file kmail.kcfg line 185
#: rc.cpp:691
#, no-c-format
msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
+"has a problem understanding standards-compliant groupware e-mail. Turn this "
+"option on to send groupware invitations in a way that Microsoft Exchange "
+"understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 191
+#: rc.cpp:697
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 197
+#: rc.cpp:703
+#, no-c-format
+msgid ""
"When this is checked, you will not see the mail composer window. Instead, all "
"invitation mails are sent automatically. If you want to see the mail before "
"sending it, you can uncheck this option. However, be aware that the text in the "
@@ -10590,22 +11446,38 @@ msgid ""
"hand."
msgstr ""
-#. i18n: file kmail.kcfg line 205
-#: rc.cpp:694
+#. i18n: file kmail.kcfg line 213
+#: rc.cpp:706
#, no-c-format
msgid "Delete invitation emails after the reply to them has been sent"
msgstr ""
-#. i18n: file kmail.kcfg line 206
-#: rc.cpp:697
+#. i18n: file kmail.kcfg line 214
+#: rc.cpp:709
#, no-c-format
msgid ""
"When this is checked, received invitation emails that have been replied to will "
"be moved to the Trash folder, once the reply has been successfully sent."
msgstr ""
-#. i18n: file kmail.kcfg line 215
-#: rc.cpp:700
+#. i18n: file kmail.kcfg line 219
+#: rc.cpp:712
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 224
+#: rc.cpp:715
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 233
+#: rc.cpp:718
#, no-c-format
msgid ""
"<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -10614,16 +11486,16 @@ msgid ""
"IMAP resource; this is done in the Trinity Control Center.</p>"
msgstr ""
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. i18n: file kmail.kcfg line 238
+#: rc.cpp:721
#, no-c-format
msgid ""
"<p>Usually you will not have any reason to see the folders that hold the IMAP "
"resources. But if you need to see them, you can set that here.</p>"
msgstr ""
-#. i18n: file kmail.kcfg line 229
-#: rc.cpp:706
+#. i18n: file kmail.kcfg line 247
+#: rc.cpp:724
#, no-c-format
msgid ""
"<p>If the account used for storing groupware information \"\n"
@@ -10634,8 +11506,8 @@ msgid ""
" \"mail via an additional online IMAP account.</p>"
msgstr ""
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:712
+#. i18n: file kmail.kcfg line 251
+#: rc.cpp:730
#, no-c-format
msgid ""
"<p>Choose the storage format of the groupware folders. "
@@ -10648,22 +11520,22 @@ msgid ""
"Kolab server or a compatible solution.</li></ul></p>"
msgstr ""
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. i18n: file kmail.kcfg line 260
+#: rc.cpp:733
#, no-c-format
msgid ""
"<p>This chooses the parent of the IMAP resource folders.</p>"
"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
msgstr ""
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:718
+#. i18n: file kmail.kcfg line 265
+#: rc.cpp:736
#, no-c-format
msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
msgstr ""
-#. i18n: file kmail.kcfg line 252
-#: rc.cpp:721
+#. i18n: file kmail.kcfg line 270
+#: rc.cpp:739
#, no-c-format
msgid ""
"<p>If you want to set the folder names of the IMAP storage to your local "
@@ -10674,101 +11546,89 @@ msgid ""
"<p>So do not set this unless you have to.</p>"
msgstr ""
-#. i18n: file kmail.kcfg line 258
-#: rc.cpp:724
-#, no-c-format
-msgid "Only filter mails received in disconnected IMAP inbox."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 262
-#: rc.cpp:727
+#. i18n: file kmail.kcfg line 276
+#: rc.cpp:742
#, no-c-format
msgid "Also filter new mails received in groupware folders."
msgstr ""
-#. i18n: file kmail.kcfg line 267
-#: rc.cpp:730
+#. i18n: file kmail.kcfg line 283
+#: rc.cpp:745
#, no-c-format
msgid ""
"Synchronize groupware changes in DIMAP folders immediately when being online."
msgstr ""
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:733
+#. i18n: file kmail.kcfg line 292
+#: rc.cpp:748
#, no-c-format
msgid ""
"This value is used to decide whether the KMail Introduction should be "
"displayed."
msgstr ""
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:736
+#. i18n: file kmail.kcfg line 299
+#: rc.cpp:751
#, no-c-format
msgid "Maximal number of connections per host"
msgstr ""
-#. i18n: file kmail.kcfg line 284
-#: rc.cpp:739
+#. i18n: file kmail.kcfg line 300
+#: rc.cpp:754
#, no-c-format
msgid ""
"This can be used to restrict the number of connections per host while checking "
"for new mail. By default the number of connections is unlimited (0)."
msgstr ""
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
#, no-c-format
msgid "Show quick search line edit"
msgstr ""
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. i18n: file kmail.kcfg line 309
+#: rc.cpp:760
#, no-c-format
msgid ""
"This option enables or disables the search line edit above the message list "
"which can be used to quickly search the information shown in the message list."
msgstr ""
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, no-c-format
-msgid "Show folder quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 301
-#: rc.cpp:751
+#. i18n: file kmail.kcfg line 313
+#: rc.cpp:763
#, no-c-format
msgid "Hide local inbox if unused"
msgstr ""
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:754
+#. i18n: file kmail.kcfg line 321
+#: rc.cpp:766
#, no-c-format
msgid "Forward Inline As Default."
msgstr ""
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:757
+#. i18n: file kmail.kcfg line 325
+#: rc.cpp:769
#, no-c-format
msgid ""
"Allow the semicolon charactor (';') to be used as separator in the message "
"composer."
msgstr ""
-#. i18n: file kmail.kcfg line 316
-#: rc.cpp:760
+#. i18n: file kmail.kcfg line 328
+#: rc.cpp:772
#, no-c-format
msgid "Keep original charset when replying or forwarding if possible"
msgstr ""
-#. i18n: file kmail.kcfg line 320
-#: rc.cpp:763
+#. i18n: file kmail.kcfg line 332
+#: rc.cpp:775
#, no-c-format
msgid "A&utomatically insert signature"
msgstr ""
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. i18n: file kmail.kcfg line 337
+#: rc.cpp:778
#, no-c-format
msgid ""
"Remember this identity, so that it will be used in future composer windows as "
@@ -10776,44 +11636,67 @@ msgid ""
" "
msgstr ""
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. i18n: file kmail.kcfg line 341
+#: rc.cpp:782
#, no-c-format
msgid ""
"Remember this folder for sent items, so that it will be used in future composer "
"windows as well."
msgstr ""
-#. i18n: file kmail.kcfg line 333
-#: rc.cpp:773
+#. i18n: file kmail.kcfg line 345
+#: rc.cpp:785
#, no-c-format
msgid ""
"Remember this mail transport, so that it will be used in future composer "
"windows as well."
msgstr ""
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:776
+#. i18n: file kmail.kcfg line 350
+#: rc.cpp:788
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows as "
+"well.\n"
+" "
+msgstr ""
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
#, no-c-format
msgid "Word &wrap at column:"
msgstr ""
-#. i18n: file kmail.kcfg line 360
-#: rc.cpp:785
+#. i18n: file kmail.kcfg line 368
+#: rc.cpp:798
+#, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 370
+#: rc.cpp:801 rc.cpp:804
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and ask "
+"for a confirmation before sending the mail. The warning can be turned off."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 390
+#: rc.cpp:810
#, no-c-format
msgid ""
"Turn this option on to make Outlook &#8482; understand attachment names "
"containing non-English characters"
msgstr ""
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
#, no-c-format
msgid "Automatically request &message disposition notifications"
msgstr ""
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
#, no-c-format
msgid ""
"<qt>"
@@ -10824,28 +11707,28 @@ msgid ""
"<em>Request Disposition Notification</em>.</p></qt>"
msgstr ""
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
#, no-c-format
msgid "Use recent addresses for autocompletion"
msgstr ""
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. i18n: file kmail.kcfg line 422
+#: rc.cpp:825
#, no-c-format
msgid ""
"Disable this option if you do not want recently used addresses to appear in the "
"autocompletion list in the composer's address fields."
msgstr ""
-#. i18n: file kmail.kcfg line 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
#, no-c-format
msgid "Autosave interval:"
msgstr ""
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. i18n: file kmail.kcfg line 444
+#: rc.cpp:831
#, no-c-format
msgid ""
"A backup copy of the text in the composer window can be created regularly. The "
@@ -10853,93 +11736,111 @@ msgid ""
"setting it to the value 0."
msgstr ""
-#. i18n: file kmail.kcfg line 418
-#: rc.cpp:809
+#. i18n: file kmail.kcfg line 448
+#: rc.cpp:834
#, no-c-format
msgid "Insert signatures above quoted text"
msgstr ""
-#. i18n: file kmail.kcfg line 425
-#: rc.cpp:812
+#. i18n: file kmail.kcfg line 455
+#: rc.cpp:837
#, no-c-format
msgid "Replace recognized prefi&x with \"Re:\""
msgstr ""
-#. i18n: file kmail.kcfg line 432
-#: rc.cpp:815
+#. i18n: file kmail.kcfg line 462
+#: rc.cpp:840
#, no-c-format
msgid "Replace recognized prefix with \"&Fwd:\""
msgstr ""
-#. i18n: file kmail.kcfg line 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
#, no-c-format
msgid "Use smart &quoting"
msgstr ""
-#. i18n: file kmail.kcfg line 441
-#: rc.cpp:821
+#. i18n: file kmail.kcfg line 470
+#: rc.cpp:846
+#, no-c-format
+msgid "Remove the signature when replying"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 474
+#: rc.cpp:849
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 479
+#: rc.cpp:852
#, no-c-format
msgid "Type of addressee selector"
msgstr ""
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:824
+#. i18n: file kmail.kcfg line 481
+#: rc.cpp:855
#, no-c-format
msgid ""
"Sets the type of the dialog for selecting recipients for To,\n"
" CC and BCC."
msgstr ""
-#. i18n: file kmail.kcfg line 451
-#: rc.cpp:828
+#. i18n: file kmail.kcfg line 489
+#: rc.cpp:859
#, no-c-format
msgid "Type of recipients editor"
msgstr ""
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. i18n: file kmail.kcfg line 491
+#: rc.cpp:862
#, no-c-format
msgid ""
"Sets the type of the recipients editor for editing To,\n"
" CC and BCC."
msgstr ""
-#. i18n: file kmail.kcfg line 468
-#: rc.cpp:835
+#. i18n: file kmail.kcfg line 506
+#: rc.cpp:866
#, no-c-format
msgid "Maximum number of recipient editor lines."
msgstr ""
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:838
+#. i18n: file kmail.kcfg line 512
+#: rc.cpp:869
#, no-c-format
msgid ""
"List of message part types to strip off mails that are being forwarded inline."
msgstr ""
-#. i18n: file kmail.kcfg line 478
-#: rc.cpp:841
+#. i18n: file kmail.kcfg line 516
+#: rc.cpp:872
#, no-c-format
msgid "The maximum size in MB that email attachments are allowed to have."
msgstr ""
-#. i18n: file kmail.kcfg line 483
-#: rc.cpp:844
+#. i18n: file kmail.kcfg line 521
+#: rc.cpp:875
#, no-c-format
msgid "Show the Text Snippet Management and Insertion Panel in the composer."
msgstr ""
-#. i18n: file kmail.kcfg line 490
-#: rc.cpp:847
+#. i18n: file kmail.kcfg line 528
+#: rc.cpp:878
#, no-c-format
msgid ""
"Show the GnuPG Audit Log even after crypto operations that completed "
"successfully."
msgstr ""
-#. i18n: file kmail.kcfg line 530
-#: rc.cpp:850
+#. i18n: file kmail.kcfg line 557
+#: rc.cpp:881
+#, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
#, no-c-format
msgid ""
"Some emails, especially those generated automatically, do not specify the "
@@ -10949,88 +11850,102 @@ msgid ""
"As a default the encoding configured for the whole system is used."
msgstr ""
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. i18n: file kmail.kcfg line 578
+#: rc.cpp:887
#, no-c-format
msgid ""
"Changing this from its default 'Auto' will force the use of the specified "
"encoding for all emails, regardless of what they specify themselves."
msgstr ""
-#. i18n: file kmail.kcfg line 542
-#: rc.cpp:859
+#. i18n: file kmail.kcfg line 584
+#: rc.cpp:893
#, no-c-format
msgid ""
"Enable this if you want smileys like :-) appearing in the message text to be "
"replaced by emoticons (small pictures)."
msgstr ""
-#. i18n: file kmail.kcfg line 547
-#: rc.cpp:865
+#. i18n: file kmail.kcfg line 589
+#: rc.cpp:899
#, no-c-format
msgid ""
"Enable this option to show different levels of quoted text. Disable to hide the "
"levels of quoted text."
msgstr ""
-#. i18n: file kmail.kcfg line 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
#, no-c-format
msgid "Automatic collapse level:"
msgstr ""
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. i18n: file kmail.kcfg line 600
+#: rc.cpp:905
#, no-c-format
msgid "Reduce font size for quoted text"
msgstr ""
-#. i18n: file kmail.kcfg line 559
-#: rc.cpp:874
+#. i18n: file kmail.kcfg line 601
+#: rc.cpp:908
#, no-c-format
msgid "Enable this option to show quoted text with a smaller font."
msgstr ""
-#. i18n: file kmail.kcfg line 570
-#: rc.cpp:877
+#. i18n: file kmail.kcfg line 612
+#: rc.cpp:911
+#, no-c-format
+msgid "Show current message sender time"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 613
+#: rc.cpp:914
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 618
+#: rc.cpp:917
#, no-c-format
msgid "Show user agent in fancy headers"
msgstr ""
-#. i18n: file kmail.kcfg line 571
-#: rc.cpp:880
+#. i18n: file kmail.kcfg line 619
+#: rc.cpp:920
#, no-c-format
msgid ""
"Enable this option to get the User-Agent and X-Mailer header lines displayed "
"when using fancy headers."
msgstr ""
-#. i18n: file kmail.kcfg line 576
-#: rc.cpp:883
+#. i18n: file kmail.kcfg line 624
+#: rc.cpp:923
#, no-c-format
msgid "Allow to delete attachments of existing mails."
msgstr ""
-#. i18n: file kmail.kcfg line 580
-#: rc.cpp:886
+#. i18n: file kmail.kcfg line 628
+#: rc.cpp:926
#, no-c-format
msgid "Allow to edit attachments of existing mails."
msgstr ""
-#. i18n: file kmail.kcfg line 585
-#: rc.cpp:889
+#. i18n: file kmail.kcfg line 633
+#: rc.cpp:929
#, no-c-format
msgid "Always decrypt messages when viewing or ask befor decrypting"
msgstr ""
-#. i18n: file kmail.kcfg line 599
-#: rc.cpp:892
+#. i18n: file kmail.kcfg line 647
+#: rc.cpp:932
#, no-c-format
msgid "Send Message Disposition Notifications with an empty sender."
msgstr ""
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:895
+#. i18n: file kmail.kcfg line 648
+#: rc.cpp:935
#, no-c-format
msgid ""
"Send Message Disposition Notifications with an empty sender string. Some "
@@ -11038,90 +11953,82 @@ msgid ""
"problems sending MDNs, uncheck this option."
msgstr ""
-#. i18n: file kmail.kcfg line 606
-#: rc.cpp:898
+#. i18n: file kmail.kcfg line 654
+#: rc.cpp:938
#, no-c-format
msgid "Phrases has been converted to templates"
msgstr ""
-#. i18n: file kmail.kcfg line 607
-#: rc.cpp:901
+#. i18n: file kmail.kcfg line 655
+#: rc.cpp:941
#, no-c-format
msgid "Old phrases have been converted to templates"
msgstr ""
-#. i18n: file kmail.kcfg line 611
-#: rc.cpp:904
+#. i18n: file kmail.kcfg line 659
+#: rc.cpp:944
#, no-c-format
msgid "Message template for new message"
msgstr ""
-#. i18n: file kmail.kcfg line 616
-#: rc.cpp:907
+#. i18n: file kmail.kcfg line 664
+#: rc.cpp:947
#, no-c-format
msgid "Message template for reply"
msgstr ""
-#. i18n: file kmail.kcfg line 621
-#: rc.cpp:910
+#. i18n: file kmail.kcfg line 669
+#: rc.cpp:950
#, no-c-format
msgid "Message template for reply to all"
msgstr ""
-#. i18n: file kmail.kcfg line 626
-#: rc.cpp:913
+#. i18n: file kmail.kcfg line 674
+#: rc.cpp:953
#, no-c-format
msgid "Message template for forward"
msgstr ""
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
#, no-c-format
msgid "Quote characters"
msgstr ""
-#. i18n: file kmail.kcfg line 640
-#: rc.cpp:919
+#. i18n: file kmail.kcfg line 688
+#: rc.cpp:959
#, no-c-format
msgid "Allow out-of-office settings to to be changeable by the user."
msgstr ""
-#. i18n: file kmail.kcfg line 644
-#: rc.cpp:922
+#. i18n: file kmail.kcfg line 692
+#: rc.cpp:962
#, no-c-format
msgid ""
"Allow users to upload out-of-office sieve scripts, but disallow them changin "
"any settings, such as the domain to react to and the spam reaction switch."
msgstr ""
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:925
+#. i18n: file kmail.kcfg line 696
+#: rc.cpp:965
#, no-c-format
msgid "Send out-of-office replies to mails coming from this domain only."
msgstr ""
-#. i18n: file kmail.kcfg line 652
-#: rc.cpp:928
+#. i18n: file kmail.kcfg line 700
+#: rc.cpp:968
#, no-c-format
msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
msgstr ""
-#. i18n: file kmail.kcfg line 656
-#: rc.cpp:931
+#. i18n: file kmail.kcfg line 704
+#: rc.cpp:971
#, no-c-format
msgid ""
"Check if there is still an active out-of-office reply configured when starting "
"KMail."
msgstr ""
-#: recipientseditor.cpp:100
-msgid "To"
-msgstr ""
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr ""
-
#: recipientseditor.cpp:104
msgid "BCC"
msgstr ""
@@ -11134,50 +12041,50 @@ msgstr ""
msgid "Select type of recipient"
msgstr ""
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
msgid "Remove recipient line"
msgstr ""
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
msgid "<b>To:</b><br/>"
msgstr ""
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
msgid "<b>CC:</b><br/>"
msgstr ""
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
msgid "<b>BCC:</b><br/>"
msgstr ""
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
msgid "Save List..."
msgstr ""
-#: recipientseditor.cpp:772
-msgid "Save recipients as distribution list"
-msgstr ""
-
#: recipientseditor.cpp:774
-msgid "Se&lect..."
+msgid "Save recipients as distribution list"
msgstr ""
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
msgid "Select recipients from address book"
msgstr ""
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
msgid "No recipients"
msgstr ""
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
#, c-format
msgid ""
"_n: 1 recipient\n"
"%n recipients"
msgstr ""
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
msgid "Truncating recipients list to %1 of %2 entries."
msgstr ""
@@ -11264,11 +12171,11 @@ msgid ""
"available addresses."
msgstr ""
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
msgid "You cannot redirect the message without an address."
msgstr ""
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
msgid "Empty Redirection Address"
msgstr ""
@@ -11402,77 +12309,77 @@ msgstr ""
msgid "I&nclude sub-folders"
msgstr ""
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
msgid "Sender/Receiver"
msgstr ""
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
msgid "Search folder &name:"
msgstr ""
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
msgid "Op&en Search Folder"
msgstr ""
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
msgid "Open &Message"
msgstr ""
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
msgid "AMiddleLengthText..."
msgstr ""
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
msgid "Ready."
msgstr ""
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
msgid "Clear Selection"
msgstr ""
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
#, c-format
msgid ""
"_n: %n message searched\n"
"%n messages searched"
msgstr ""
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
#, fuzzy
msgid "Done."
msgstr "<none>"
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
msgid ""
"_n: %n match in %1\n"
"%n matches in %1"
msgstr ""
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
msgid "Search canceled."
msgstr ""
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
msgid ""
"_n: %n match so far in %1\n"
"%n matches so far in %1"
msgstr ""
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
#, c-format
msgid ""
"_n: %n message\n"
"%n messages"
msgstr ""
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
#, c-format
msgid ""
"_n: %n match\n"
"%n matches"
msgstr ""
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
msgid "Searching in %1. %2 searched so far"
msgstr ""
@@ -11502,40 +12409,40 @@ msgid ""
"\n"
msgstr ""
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
msgid ""
"Collecting data for account '%1'...\n"
msgstr ""
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
msgid ""
"------------------------------------------------------------\n"
msgstr ""
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
msgid ""
"(Account does not support Sieve)\n"
"\n"
msgstr ""
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
msgid ""
"(Account is not an IMAP account)\n"
"\n"
msgstr ""
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
msgid ""
"Contents of script '%1':\n"
msgstr ""
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
msgid ""
"(This script is empty.)\n"
"\n"
msgstr ""
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
msgid ""
"------------------------------------------------------------\n"
"%1\n"
@@ -11543,39 +12450,39 @@ msgid ""
"\n"
msgstr ""
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
msgid ""
"Sieve capabilities:\n"
msgstr ""
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
msgid "(No special capabilities available)"
msgstr ""
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
msgid ""
"Available Sieve scripts:\n"
msgstr ""
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
msgid ""
"(No Sieve scripts available on this server)\n"
"\n"
msgstr ""
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
msgid ""
"Active script: %1\n"
"\n"
msgstr ""
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
msgid ""
"Sieve script installed successfully on the server.\n"
"Out of Office reply is now active."
msgstr ""
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
msgid ""
"Sieve script installed successfully on the server.\n"
"Out of Office reply has been deactivated."
@@ -11656,18 +12563,22 @@ msgstr ""
msgid "New entry:"
msgstr ""
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
msgid "New Value"
msgstr ""
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
msgid "Change Value"
msgstr ""
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
msgid "Sh&ortcut:"
msgstr ""
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
#: snippetwidget.cpp:148
#, c-format
msgid "Snippet %1"
@@ -11744,8 +12655,8 @@ msgstr ""
#: subscriptiondialog.cpp:376
msgid ""
-"Currently subscriptions are not used for server %1\n"
-"do you want to enable subscriptions?"
+"Currently subscriptions are not used for server. %1\n"
+"Do you want to enable subscriptions?"
msgstr ""
#: subscriptiondialog.cpp:378
@@ -11760,28 +12671,33 @@ msgstr ""
msgid "Do Not Enable"
msgstr ""
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
msgid "Cannot insert content from file %1: %2"
msgstr ""
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, c-format
+msgid "Attachment %1"
+msgstr ""
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
msgid "Pipe command exit with status %1: %2"
msgstr ""
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
msgid "Pipe command killed by signal %1: %2"
msgstr ""
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
msgid "Pipe command did not finish within %1 seconds: %2"
msgstr ""
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
#, c-format
msgid "Cannot write to process stdin: %1"
msgstr ""
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
#, c-format
msgid "Cannot start pipe command from template: %1"
msgstr ""
@@ -11835,9 +12751,9 @@ msgid ""
"---------- %1 ----------\n"
"\n"
"Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
"From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
"\n"
"%TEXT\n"
"-------------------------------------------------------\n"
@@ -11846,35 +12762,39 @@ msgstr ""
#: templatesconfiguration.cpp:511
msgid ""
"%REM=\"Default new message template\"%-\n"
-"%BLANK"
+"%BLANK\n"
+"%BLANK\n"
+"%BLANK\n"
msgstr ""
-#: templatesconfiguration.cpp:518
+#: templatesconfiguration.cpp:520
msgid ""
+"%CURSOR\n"
+"%BLANK\n"
"%REM=\"Default reply template\"%-\n"
"On %ODATEEN %OTIMELONGEN you wrote:\n"
"%QUOTE\n"
-"%CURSOR\n"
msgstr ""
-#: templatesconfiguration.cpp:527
+#: templatesconfiguration.cpp:530
msgid ""
+"%CURSOR\n"
+"%BLANK\n"
"%REM=\"Default reply all template\"%-\n"
"On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
"%QUOTE\n"
-"%CURSOR\n"
msgstr ""
-#: templatesconfiguration.cpp:536
+#: templatesconfiguration.cpp:541
msgid ""
"%REM=\"Default forward template\"%-\n"
"\n"
"---------- Forwarded Message ----------\n"
"\n"
"Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
"From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
"\n"
"%TEXT\n"
"-------------------------------------------------------\n"
@@ -11900,155 +12820,159 @@ msgstr ""
msgid "Message Text as Is"
msgstr ""
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
msgid "Message Id"
msgstr ""
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
msgid "Date in Short Format"
msgstr ""
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
msgid "Date in C Locale"
msgstr ""
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
msgid "Day of Week"
msgstr ""
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
msgid "Time"
msgstr ""
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
msgid "Time in Long Format"
msgstr ""
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
msgid "Time in C Locale"
msgstr ""
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
msgid "To Field Address"
msgstr ""
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
msgid "To Field Name"
msgstr ""
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
msgid "To Field First Name"
msgstr ""
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
msgid "To Field Last Name"
msgstr ""
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
msgid "CC Field Address"
msgstr ""
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
msgid "CC Field Name"
msgstr ""
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
msgid "CC Field First Name"
msgstr ""
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
msgid "CC Field Last Name"
msgstr ""
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
msgid "From Field Address"
msgstr ""
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
msgid "From Field Name"
msgstr ""
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
msgid "From Field First Name"
msgstr ""
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
msgid "From Field Last Name"
msgstr ""
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+msgid "Addresses of all original recipients"
+msgstr ""
+
+#: templatesinsertcommand.cpp:149
msgid "Quoted Headers"
msgstr ""
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
msgid "Headers as Is"
msgstr ""
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
msgid "Header Content"
msgstr ""
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
msgid "Current Message"
msgstr ""
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
msgid "Process With External Programs"
msgstr ""
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
msgid "Insert Result of Command"
msgstr ""
-#: templatesinsertcommand.cpp:260
+#: templatesinsertcommand.cpp:263
msgid "Pipe Original Message Body and Insert Result as Quoted Text"
msgstr ""
-#: templatesinsertcommand.cpp:264
+#: templatesinsertcommand.cpp:267
msgid "Pipe Original Message Body and Insert Result as Is"
msgstr ""
-#: templatesinsertcommand.cpp:268
+#: templatesinsertcommand.cpp:271
msgid "Pipe Original Message with Headers and Insert Result as Is"
msgstr ""
-#: templatesinsertcommand.cpp:272
+#: templatesinsertcommand.cpp:275
msgid "Pipe Current Message Body and Insert Result as Is"
msgstr ""
-#: templatesinsertcommand.cpp:276
+#: templatesinsertcommand.cpp:279
msgid "Pipe Current Message Body and Replace with Result"
msgstr ""
-#: templatesinsertcommand.cpp:285
+#: templatesinsertcommand.cpp:288
msgid "Set Cursor Position"
msgstr ""
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
msgid "Insert File Content"
msgstr ""
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
msgid "DNL"
msgstr ""
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
msgid "Template Comment"
msgstr ""
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
msgid "No Operation"
msgstr ""
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
msgid "Clear Generated Message"
msgstr ""
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
msgid "Turn Debug On"
msgstr ""
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
msgid "Turn Debug Off"
msgstr ""
@@ -12126,56 +13050,64 @@ msgstr ""
msgid "There is nothing to undo."
msgstr ""
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
msgid "Turn on HTML rendering for this message."
msgstr ""
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
msgid "Load external references from the Internet for this message."
msgstr ""
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
msgid "Work online."
msgstr ""
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
msgid "Decrypt message."
msgstr ""
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
msgid "Show signature details."
msgstr ""
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
msgid "Hide signature details."
msgstr ""
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+msgid "Hide attachment list"
+msgstr ""
+
+#: urlhandlermanager.cpp:496
+msgid "Show attachment list"
+msgstr ""
+
+#: urlhandlermanager.cpp:528
msgid "Expand all quoted text."
msgstr ""
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
msgid "Collapse quoted text."
msgstr ""
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
msgid "Could not start certificate manager. Please check your installation."
msgstr ""
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
#, c-format
msgid "Show certificate 0x%1"
msgstr ""
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
msgid "Attachment #%1 (unnamed)"
msgstr ""
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
msgid "Show GnuPG Audit Log for this operation"
msgstr ""
-#: vacation.cpp:562
+#: vacation.cpp:566
msgid ""
"I am out of office till %1.\n"
"\n"
@@ -12189,7 +13121,7 @@ msgid ""
"-- <enter your name and email address here>\n"
msgstr ""
-#: vacation.cpp:606
+#: vacation.cpp:612
msgid ""
"Your server did not list \"vacation\" in its list of supported Sieve "
"extensions;\n"
@@ -12197,28 +13129,28 @@ msgid ""
"Please contact you system administrator."
msgstr ""
-#: vacation.cpp:616
+#: vacation.cpp:622
msgid "Configure \"Out of Office\" Replies"
msgstr ""
-#: vacation.cpp:626
+#: vacation.cpp:632
msgid ""
"Someone (probably you) changed the vacation script on the server.\n"
"KMail is no longer able to determine the parameters for the autoreplies.\n"
"Default values will be used."
msgstr ""
-#: vacation.cpp:651
+#: vacation.cpp:657
msgid ""
"There is still an active out-of-office reply configured.\n"
"Do you want to edit it?"
msgstr ""
-#: vacation.cpp:652
+#: vacation.cpp:658
msgid "Out-of-office reply still active"
msgstr ""
-#: vacation.cpp:653
+#: vacation.cpp:659
msgid "Ignore"
msgstr ""
@@ -12230,39 +13162,39 @@ msgstr ""
msgid "&Activate vacation notifications"
msgstr ""
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
msgid "&Resend notification only after:"
msgstr ""
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
msgid "&Send responses for these addresses:"
msgstr ""
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
msgid "Do not send vacation replies to spam messages"
msgstr ""
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
msgid "Only react to mail coming from domain"
msgstr ""
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
msgid "VCard Viewer"
msgstr ""
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
msgid "&Import"
msgstr ""
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
msgid "&Next Card"
msgstr ""
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
msgid "&Previous Card"
msgstr ""
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
msgid "Failed to parse vCard."
msgstr ""
@@ -12449,7 +13381,7 @@ msgstr ""
msgid "To Do"
msgstr ""
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
msgid "Has Attachment"
msgstr ""
@@ -12457,6 +13389,11 @@ msgstr ""
msgid "%1 of %2 %3 used"
msgstr ""
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
#: util.h:208
msgid ""
"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
diff --git a/tde-i18n-ss/messages/tdepim/tdeio_imap4.po b/tde-i18n-ss/messages/tdepim/tdeio_imap4.po
index 54176e6c37f..1a2f87e283d 100644
--- a/tde-i18n-ss/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-ss/messages/tdepim/tdeio_imap4.po
@@ -5,10 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_imap4\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
"PO-Revision-Date: 2002-11-10 16:26+0200\n"
"Last-Translator: Adam Mathebula <adam@translate.org.za>\n"
"Language-Team: Siswati <siswati@translate.org.za>\n"
+"Language: ss\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -102,11 +103,7 @@ msgid ""
"%2"
msgstr "Akukhonakali kuvula sigcini mafayhela %1. Sigcini siphendvulile: %2"
-#: imap4.cc:1783
-msgid "Unable to close mailbox."
-msgstr "Akukhonakali kuvala libhokisi leliposi."
-
-#: imap4.cc:2051
+#: imap4.cc:2052
msgid ""
"The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
"It identified itself with: %2"
@@ -114,7 +111,7 @@ msgstr ""
"Sigcini kasincedzisi %1 i-IMAP4 hhayi IMAP4rev1 ngalokunjalo.\n"
"Kutatisile ngekwako nge: %2"
-#: imap4.cc:2062
+#: imap4.cc:2063
msgid ""
"The server does not support TLS.\n"
"Disable this security feature to connect unencrypted."
@@ -122,24 +119,24 @@ msgstr ""
"Sigcini kasincedzisi i-TLS.\n"
"Khwalisa lobunjalo bekuphepha kuze uchumanise ngapahndle kwekubhala ngemakhodi."
-#: imap4.cc:2087
+#: imap4.cc:2088
msgid "Starting TLS failed."
msgstr "Kucalisa TSL kwehlulekile."
-#: imap4.cc:2096
+#: imap4.cc:2097
msgid "LOGIN is disabled by the server."
msgstr ""
-#: imap4.cc:2103
+#: imap4.cc:2104
msgid "The authentication method %1 is not supported by the server."
msgstr "Indlela yekuniketa sicininsekiso %1 kayincedziswanga sigcini."
-#: imap4.cc:2119
+#: imap4.cc:2132
#, fuzzy
msgid "Username and password for your IMAP account:"
msgstr "Ligama lemsebentini kanye nelibitomfihlo le akhawundi yakho ye IMAP:"
-#: imap4.cc:2133
+#: imap4.cc:2146
#, fuzzy
msgid ""
"Unable to login. Probably the password is wrong.\n"
@@ -150,7 +147,7 @@ msgstr ""
"Sigcini siphendvulile:\n"
"%1"
-#: imap4.cc:2140
+#: imap4.cc:2153
#, fuzzy
msgid ""
"Unable to authenticate via %1.\n"
@@ -161,14 +158,17 @@ msgstr ""
"Sigcini siphendvulile:\n"
"%2"
-#: imap4.cc:2147
+#: imap4.cc:2160
msgid "SASL authentication is not compiled into tdeio_imap4."
msgstr ""
-#: imap4.cc:2691
+#: imap4.cc:2704
msgid "Unable to open folder %1. The server replied: %2"
msgstr "Akukhonakali kuvula sigcini mafayhela %1. Sigcini siphendvulile: %2"
+#~ msgid "Unable to close mailbox."
+#~ msgstr "Akukhonakali kuvala libhokisi leliposi."
+
#~ msgid "Unable to get information about folder %1. The server replied: %2"
#~ msgstr "Akukhonakali kutfola umnininingwane mayelana nesigcini mafayela %1. Sigcini siphendvulile: %2"