commit 3b2977e64340b30c6626c6a1576321da38bfc51b
parent e4eb5e4f7d55621df39fe3de4171a9aa0aea5f02
Author: Paul Mangan <paul@claws-mail.org>
Date: Sun, 28 Sep 2008 08:13:05 +0000
2008-09-28 [paul] 3.5.0cvs137
* po/en_GB.po
updated
Diffstat:
4 files changed, 3613 insertions(+), 4135 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-28 [paul] 3.5.0cvs137
+
+ * po/en_GB.po
+ updated
+
2008-09-27 [colin] 3.5.0cvs136
* src/account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3548,3 +3548,4 @@
( cvs diff -u -r 1.60.2.54 -r 1.60.2.55 po/es.po; ) > 3.5.0cvs134.patchset
( cvs diff -u -r 1.179.2.230 -r 1.179.2.231 src/imap.c; ) > 3.5.0cvs135.patchset
( cvs diff -u -r 1.61.2.88 -r 1.61.2.89 src/account.c; cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/account.h; ) > 3.5.0cvs136.patchset
+( cvs diff -u -r 1.12.2.17 -r 1.12.2.18 po/en_GB.po; ) > 3.5.0cvs137.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=136
+EXTRA_VERSION=137
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/po/en_GB.po b/po/en_GB.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: claws-mail\n"
"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2008-01-27 08:04+0000\n"
-"PO-Revision-Date: 2008-01-27 08:00+0000\n"
+"POT-Creation-Date: 2008-09-28 08:53+0100\n"
+"PO-Revision-Date: 2008-09-28 08:00+0000\n"
"Last-Translator: Paul Mangan <paul@claws-mail.org>\n"
"Language-Team: Paul Mangan <paul@claws-mail.org>\n"
"MIME-Version: 1.0\n"
@@ -12,120 +12,120 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: src/account.c:381
+#: src/account.c:384
msgid ""
"Some composing windows are open.\n"
"Please close all the composing windows before editing the accounts."
msgstr ""
-#: src/account.c:428
+#: src/account.c:431
msgid "Can't create folder."
msgstr ""
-#: src/account.c:699
+#: src/account.c:702
msgid "Edit accounts"
msgstr ""
-#: src/account.c:721
+#: src/account.c:724
msgid ""
"Using 'Get Mail' will retrieve messages from your Accounts in the order "
"given, the checkbox indicates which accounts will be included. Bold text "
"indicates the default account."
msgstr ""
-#: src/account.c:792
+#: src/account.c:795
msgid " _Set as default account "
msgstr ""
-#: src/account.c:884
+#: src/account.c:887
msgid "Accounts with remote folders cannot be copied."
msgstr ""
-#: src/account.c:891
+#: src/account.c:894
#, c-format
msgid "Copy of %s"
msgstr ""
-#: src/account.c:1052
+#: src/account.c:1053
#, c-format
msgid "Do you really want to delete the account '%s'?"
msgstr ""
-#: src/account.c:1054
+#: src/account.c:1055
msgid "(Untitled)"
msgstr ""
-#: src/account.c:1055
+#: src/account.c:1056
msgid "Delete account"
msgstr ""
-#: src/account.c:1508
+#: src/account.c:1527
msgid "Accounts List Get Column Name|G"
msgstr ""
-#: src/account.c:1514
+#: src/account.c:1533
msgid "'Get Mail' retrieves mail from the checked accounts"
msgstr ""
-#: src/account.c:1521 src/addressadd.c:196 src/addressbook.c:137
-#: src/addrduplicates.c:479 src/compose.c:6294 src/compose.c:6592
-#: src/editaddress.c:1270 src/editaddress.c:1327 src/editaddress.c:1343
-#: src/editbook.c:175 src/editgroup.c:287 src/editjpilot.c:270
-#: src/editldap.c:434 src/editvcard.c:183 src/importmutt.c:228
-#: src/importpine.c:227 src/mimeview.c:254
-#: src/plugins/pgpcore/select-keys.c:407 src/prefs_filtering.c:378
-#: src/prefs_filtering.c:1884 src/prefs_template.c:210
+#: src/account.c:1540 src/addressadd.c:192 src/addressbook.c:122
+#: src/addrduplicates.c:480 src/compose.c:6395 src/compose.c:6689
+#: src/editaddress.c:1269 src/editaddress.c:1326 src/editaddress.c:1342
+#: src/editbook.c:170 src/editgroup.c:287 src/editjpilot.c:257
+#: src/editldap.c:429 src/editvcard.c:173 src/importmutt.c:223
+#: src/importpine.c:222 src/mimeview.c:268
+#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:379
+#: src/prefs_filtering.c:1917 src/prefs_template.c:77
msgid "Name"
msgstr ""
-#: src/account.c:1529 src/prefs_account.c:1017 src/prefs_account.c:3577
+#: src/account.c:1548 src/prefs_account.c:1072 src/prefs_account.c:3808
msgid "Protocol"
msgstr ""
-#: src/account.c:1537 src/ssl_manager.c:102
+#: src/account.c:1556 src/ssl_manager.c:102
msgid "Server"
msgstr ""
-#: src/action.c:363
+#: src/action.c:373
#, c-format
msgid "Could not get message file %d"
msgstr ""
-#: src/action.c:394
+#: src/action.c:404
msgid "Could not get message part."
msgstr ""
-#: src/action.c:411
+#: src/action.c:421
#, c-format
msgid "Can't get part of multipart message: %s"
msgstr ""
-#: src/action.c:525
+#: src/action.c:586
#, c-format
msgid ""
"The selected action cannot be used in the compose window\n"
"because it contains %%f, %%F, %%as or %%p."
msgstr ""
-#: src/action.c:623
+#: src/action.c:698
msgid "There is no filtering action set"
msgstr ""
-#: src/action.c:625
+#: src/action.c:700
#, c-format
msgid ""
"Invalid filtering action(s):\n"
"%s"
msgstr ""
-#: src/action.c:847
+#: src/action.c:922
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
"%s"
msgstr ""
-#: src/action.c:942
+#: src/action.c:1017
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
@@ -133,25 +133,25 @@ msgid ""
"%s"
msgstr ""
-#: src/action.c:1162 src/action.c:1318
+#: src/action.c:1237 src/action.c:1393
msgid "Completed"
msgstr ""
-#: src/action.c:1198
+#: src/action.c:1273
#, c-format
msgid "--- Running: %s\n"
msgstr ""
-#: src/action.c:1202
+#: src/action.c:1277
#, c-format
msgid "--- Ended: %s\n"
msgstr ""
-#: src/action.c:1235
+#: src/action.c:1310
msgid "Action's input/output"
msgstr ""
-#: src/action.c:1554
+#: src/action.c:1629
#, c-format
msgid ""
"Enter the argument for the following action:\n"
@@ -159,11 +159,11 @@ msgid ""
" %s"
msgstr ""
-#: src/action.c:1559
+#: src/action.c:1634
msgid "Action's hidden user argument"
msgstr ""
-#: src/action.c:1563
+#: src/action.c:1638
#, c-format
msgid ""
"Enter the argument for the following action:\n"
@@ -171,11 +171,11 @@ msgid ""
" %s"
msgstr ""
-#: src/action.c:1568
+#: src/action.c:1643
msgid "Action's user argument"
msgstr ""
-#: src/addr_compl.c:597 src/addressbook.c:4695
+#: src/addr_compl.c:590 src/addressbook.c:4873
msgid "Group"
msgstr ""
@@ -245,645 +245,576 @@ msgid ""
"with the default set?"
msgstr ""
-#: src/addrcustomattr.c:210 src/addressbook.c:480 src/addressbook.c:496
-#: src/edittags.c:269 src/prefs_actions.c:1013 src/prefs_filtering.c:1729
-#: src/prefs_template.c:997
-msgid "/_Delete"
+#: src/addrcustomattr.c:211 src/addressbook.c:444 src/addressbook.c:472
+#: src/addressbook.c:489 src/edittags.c:269 src/prefs_actions.c:1087
+#: src/prefs_filtering.c:1754 src/prefs_template.c:1089
+msgid "_Delete"
msgstr ""
-#: src/addrcustomattr.c:211 src/edittags.c:270 src/prefs_actions.c:1014
-#: src/prefs_filtering.c:1730 src/prefs_template.c:998
-msgid "/Delete _all"
+#: src/addrcustomattr.c:212 src/edittags.c:270 src/prefs_actions.c:1088
+#: src/prefs_filtering.c:1755 src/prefs_template.c:1090
+msgid "Delete _all"
msgstr ""
-#: src/addrcustomattr.c:212
-msgid "/_Reset to default"
+#: src/addrcustomattr.c:213
+msgid "_Reset to default"
msgstr ""
-#: src/addrcustomattr.c:408
+#: src/addrcustomattr.c:412
msgid "Attribute name is not set."
msgstr ""
-#: src/addrcustomattr.c:467
+#: src/addrcustomattr.c:471
msgid "Dialog title|Edit attribute names"
msgstr ""
-#: src/addrcustomattr.c:481
+#: src/addrcustomattr.c:485
msgid "New attribute name:"
msgstr ""
-#: src/addrcustomattr.c:518
+#: src/addrcustomattr.c:522
msgid ""
"Adding or removing attribute names won't affect attributes already set for "
"contacts."
msgstr ""
-#: src/addressadd.c:165 src/prefs_filtering_action.c:185
+#: src/addressadd.c:161 src/prefs_filtering_action.c:186
msgid "Add to address book"
msgstr ""
-#: src/addressadd.c:188
+#: src/addressadd.c:184
msgid "Contact"
msgstr ""
-#: src/addressadd.c:208 src/addrduplicates.c:451
-#: src/plugins/pgpcore/select-keys.c:408 src/toolbar.c:445
+#: src/addressadd.c:204 src/addrduplicates.c:451
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:415
msgid "Address"
msgstr ""
-#: src/addressadd.c:219 src/addressbook.c:139 src/editaddress.c:1062
-#: src/editaddress.c:1137 src/editgroup.c:289
+#: src/addressadd.c:215 src/addressbook.c:124 src/editaddress.c:1061
+#: src/editaddress.c:1136 src/editgroup.c:289
msgid "Remarks"
msgstr ""
-#: src/addressadd.c:241 src/addressbook_foldersel.c:164
+#: src/addressadd.c:234 src/addressbook_foldersel.c:159
msgid "Select Address Book Folder"
msgstr ""
-#: src/addressadd.c:425 src/editaddress.c:1577 src/headerview.c:352
-#: src/textview.c:1947
+#: src/addressadd.c:430 src/editaddress.c:1576 src/headerview.c:346
+#: src/textview.c:1962
#, c-format
msgid ""
"Failed to save image: \n"
"%s"
msgstr ""
-#: src/addressadd.c:438 src/addressbook.c:3066 src/addressbook.c:3116
+#: src/addressadd.c:443 src/addressbook.c:3243 src/addressbook.c:3293
msgid "Add address(es)"
msgstr ""
-#: src/addressadd.c:439
+#: src/addressadd.c:444
msgid "Can't add the specified address"
msgstr ""
-#: src/addressbook.c:138 src/addressbook.c:4679 src/editaddress.c:1059
-#: src/editaddress.c:1120 src/editgroup.c:288 src/expldifdlg.c:525
-#: src/exporthtml.c:595 src/exporthtml.c:759 src/ldif.c:781
+#: src/addressbook.c:123 src/addressbook.c:4857 src/editaddress.c:1058
+#: src/editaddress.c:1119 src/editgroup.c:288 src/expldifdlg.c:517
+#: src/exporthtml.c:595 src/exporthtml.c:759 src/ldif.c:784
msgid "Email Address"
msgstr ""
-#: src/addressbook.c:433
-msgid "/_Book"
-msgstr ""
-
-#: src/addressbook.c:434
-msgid "/_Book/New _Book"
-msgstr ""
-
-#: src/addressbook.c:435
-msgid "/_Book/New _Folder"
-msgstr ""
-
-#: src/addressbook.c:436
-msgid "/_Book/New _vCard"
-msgstr ""
-
-#: src/addressbook.c:438
-msgid "/_Book/New _JPilot"
-msgstr ""
-
-#: src/addressbook.c:441
-msgid "/_Book/New LDAP _Server"
-msgstr ""
-
-#: src/addressbook.c:443 src/addressbook.c:446
-msgid "/_Book/---"
-msgstr ""
-
-#: src/addressbook.c:444
-msgid "/_Book/_Edit book"
-msgstr ""
-
-#: src/addressbook.c:445
-msgid "/_Book/_Delete book"
-msgstr ""
-
-#: src/addressbook.c:447
-msgid "/_Book/_Save"
-msgstr ""
-
-#: src/addressbook.c:448
-msgid "/_Book/_Close"
-msgstr ""
-
-#: src/addressbook.c:449
-msgid "/_Address"
-msgstr ""
-
-#: src/addressbook.c:450
-msgid "/_Address/_Select all"
-msgstr ""
-
-#: src/addressbook.c:451 src/addressbook.c:455 src/addressbook.c:458
-#: src/addressbook.c:461
-msgid "/_Address/---"
-msgstr ""
-
-#: src/addressbook.c:452
-msgid "/_Address/C_ut"
-msgstr ""
-
-#: src/addressbook.c:453
-msgid "/_Address/_Copy"
+#: src/addressbook.c:411 src/compose.c:540 src/mainwindow.c:461
+#: src/messageview.c:189
+msgid "_Message"
msgstr ""
-#: src/addressbook.c:454
-msgid "/_Address/_Paste"
+#: src/addressbook.c:412 src/addressbook.c:443 src/addressbook.c:471
+#: src/addressbook.c:488 src/compose.c:541 src/mainwindow.c:459
+#: src/messageview.c:187
+msgid "_Edit"
msgstr ""
-#: src/addressbook.c:456
-msgid "/_Address/_Edit"
+#: src/addressbook.c:413 src/compose.c:546 src/mainwindow.c:462
+#: src/messageview.c:190
+msgid "_Tools"
msgstr ""
-#: src/addressbook.c:457
-msgid "/_Address/_Delete"
+#: src/addressbook.c:414 src/compose.c:547 src/mainwindow.c:464
+#: src/messageview.c:191
+msgid "_Help"
msgstr ""
-#: src/addressbook.c:459
-msgid "/_Address/New _Address"
+#: src/addressbook.c:417 src/addressbook.c:474
+msgid "New _Book"
msgstr ""
-#: src/addressbook.c:460
-msgid "/_Address/New _Group"
+#: src/addressbook.c:418 src/addressbook.c:475
+msgid "New _Folder"
msgstr ""
-#: src/addressbook.c:462
-msgid "/_Address/_Mail To"
+#: src/addressbook.c:419
+msgid "New _vCard"
msgstr ""
-#: src/addressbook.c:463 src/compose.c:812 src/mainwindow.c:853
-#: src/messageview.c:394
-msgid "/_Tools"
+#: src/addressbook.c:423
+msgid "New _JPilot"
msgstr ""
-#: src/addressbook.c:464
-msgid "/_Tools/Import _LDIF file..."
+#: src/addressbook.c:426
+msgid "New LDAP _Server"
msgstr ""
-#: src/addressbook.c:465
-msgid "/_Tools/Import M_utt file..."
+#: src/addressbook.c:430
+msgid "_Edit book"
msgstr ""
-#: src/addressbook.c:466
-msgid "/_Tools/Import _Pine file..."
+#: src/addressbook.c:431
+msgid "_Delete book"
msgstr ""
-#: src/addressbook.c:467 src/addressbook.c:470 src/mainwindow.c:862
-#: src/mainwindow.c:887 src/mainwindow.c:889 src/mainwindow.c:891
-#: src/mainwindow.c:900 src/mainwindow.c:903 src/mainwindow.c:907
-#: src/messageview.c:398 src/messageview.c:419 src/messageview.c:421
-msgid "/_Tools/---"
+#: src/addressbook.c:433 src/compose.c:557
+msgid "_Save"
msgstr ""
-#: src/addressbook.c:468
-msgid "/_Tools/Export _HTML..."
+#: src/addressbook.c:434 src/compose.c:559 src/messageview.c:201
+msgid "_Close"
msgstr ""
-#: src/addressbook.c:469
-msgid "/_Tools/Export LDI_F..."
+#: src/addressbook.c:437 src/addressbook.c:486 src/messageview.c:205
+msgid "_Select all"
msgstr ""
-#: src/addressbook.c:471
-msgid "/_Tools/Find duplicates..."
+#: src/addressbook.c:439 src/addressbook.c:478 src/addressbook.c:494
+msgid "C_ut"
msgstr ""
-#: src/addressbook.c:472
-msgid "/_Tools/Edit custom attributes..."
+#: src/addressbook.c:440 src/addressbook.c:479 src/addressbook.c:495
+#: src/compose.c:567 src/mainwindow.c:493 src/messageview.c:204
+msgid "_Copy"
msgstr ""
-#: src/addressbook.c:473 src/compose.c:817 src/mainwindow.c:935
-#: src/messageview.c:424
-msgid "/_Help"
+#: src/addressbook.c:441 src/addressbook.c:480 src/addressbook.c:496
+#: src/compose.c:568
+msgid "_Paste"
msgstr ""
-#: src/addressbook.c:474 src/compose.c:818 src/mainwindow.c:941
-#: src/messageview.c:425
-msgid "/_Help/_About"
+#: src/addressbook.c:446 src/addressbook.c:491
+msgid "New _Address"
msgstr ""
-#: src/addressbook.c:479 src/addressbook.c:495 src/compose.c:579
-#: src/mainwindow.c:558 src/messageview.c:226
-msgid "/_Edit"
+#: src/addressbook.c:447 src/addressbook.c:476 src/addressbook.c:492
+msgid "New _Group"
msgstr ""
-#: src/addressbook.c:482
-msgid "/New _Book"
+#: src/addressbook.c:449 src/addressbook.c:498
+msgid "_Mail To"
msgstr ""
-#: src/addressbook.c:483
-msgid "/New _Folder"
+#: src/addressbook.c:453
+msgid "Import _LDIF file..."
msgstr ""
-#: src/addressbook.c:484 src/addressbook.c:499
-msgid "/New _Group"
+#: src/addressbook.c:454
+msgid "Import M_utt file..."
msgstr ""
-#: src/addressbook.c:486 src/addressbook.c:501
-msgid "/C_ut"
+#: src/addressbook.c:455
+msgid "Import _Pine file..."
msgstr ""
-#: src/addressbook.c:487 src/addressbook.c:502
-msgid "/_Copy"
+#: src/addressbook.c:457
+msgid "Export _HTML..."
msgstr ""
-#: src/addressbook.c:488 src/addressbook.c:503
-msgid "/_Paste"
+#: src/addressbook.c:458
+msgid "Export LDI_F..."
msgstr ""
-#: src/addressbook.c:493
-msgid "/_Select all"
+#: src/addressbook.c:460
+msgid "Find duplicates..."
msgstr ""
-#: src/addressbook.c:498
-msgid "/New _Address"
+#: src/addressbook.c:461
+msgid "Edit custom attributes..."
msgstr ""
-#: src/addressbook.c:506
-msgid "/_Mail To"
+#: src/addressbook.c:464 src/compose.c:647 src/mainwindow.c:725
+#: src/messageview.c:300
+msgid "_About"
msgstr ""
-#: src/addressbook.c:508
-msgid "/_Browse Entry"
+#: src/addressbook.c:500
+msgid "_Browse Entry"
msgstr ""
-#: src/addressbook.c:521 src/crash.c:455 src/crash.c:474 src/importldif.c:120
-#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_themes.c:690
-#: src/prefs_themes.c:722 src/prefs_themes.c:723
+#: src/addressbook.c:513 src/crash.c:455 src/crash.c:474 src/importldif.c:115
+#: src/plugins/pgpcore/sgpgme.c:142 src/prefs_themes.c:703
+#: src/prefs_themes.c:735 src/prefs_themes.c:736
msgid "Unknown"
msgstr ""
-#: src/addressbook.c:528 src/addressbook.c:547 src/importldif.c:127
+#: src/addressbook.c:520 src/addressbook.c:539 src/importldif.c:122
msgid "Success"
msgstr ""
-#: src/addressbook.c:529 src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:123
msgid "Bad arguments"
msgstr ""
-#: src/addressbook.c:530 src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:124
msgid "File not specified"
msgstr ""
-#: src/addressbook.c:531 src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:125
msgid "Error opening file"
msgstr ""
-#: src/addressbook.c:532 src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:126
msgid "Error reading file"
msgstr ""
-#: src/addressbook.c:533 src/importldif.c:132
+#: src/addressbook.c:525 src/importldif.c:127
msgid "End of file encountered"
msgstr ""
-#: src/addressbook.c:534 src/importldif.c:133
+#: src/addressbook.c:526 src/importldif.c:128
msgid "Error allocating memory"
msgstr ""
-#: src/addressbook.c:535 src/importldif.c:134
+#: src/addressbook.c:527 src/importldif.c:129
msgid "Bad file format"
msgstr ""
-#: src/addressbook.c:536 src/importldif.c:135
+#: src/addressbook.c:528 src/importldif.c:130
msgid "Error writing to file"
msgstr ""
-#: src/addressbook.c:537 src/importldif.c:136
+#: src/addressbook.c:529 src/importldif.c:131
msgid "Error opening directory"
msgstr ""
-#: src/addressbook.c:538 src/importldif.c:137
+#: src/addressbook.c:530 src/importldif.c:132
msgid "No path specified"
msgstr ""
-#: src/addressbook.c:548
+#: src/addressbook.c:540
msgid "Error connecting to LDAP server"
msgstr ""
-#: src/addressbook.c:549
+#: src/addressbook.c:541
msgid "Error initializing LDAP"
msgstr ""
-#: src/addressbook.c:550
+#: src/addressbook.c:542
msgid "Error binding to LDAP server"
msgstr ""
-#: src/addressbook.c:551
+#: src/addressbook.c:543
msgid "Error searching LDAP database"
msgstr ""
-#: src/addressbook.c:552
+#: src/addressbook.c:544
msgid "Timeout performing LDAP operation"
msgstr ""
-#: src/addressbook.c:553
+#: src/addressbook.c:545
msgid "Error in LDAP search criteria"
msgstr ""
-#: src/addressbook.c:554
+#: src/addressbook.c:546
msgid "No LDAP entries found for search criteria"
msgstr ""
-#: src/addressbook.c:555
+#: src/addressbook.c:547
msgid "LDAP search terminated on request"
msgstr ""
-#: src/addressbook.c:556
+#: src/addressbook.c:548
msgid "Error starting TLS connection"
msgstr ""
-#: src/addressbook.c:557
+#: src/addressbook.c:549
msgid "Distinguished Name (dn) is missing"
msgstr ""
-#: src/addressbook.c:558
+#: src/addressbook.c:550
msgid "Missing required information"
msgstr ""
-#: src/addressbook.c:559
+#: src/addressbook.c:551
msgid "Another contact exists with that key"
msgstr ""
-#: src/addressbook.c:560
+#: src/addressbook.c:552
msgid "Strong(er) authentication required"
msgstr ""
-#: src/addressbook.c:934
+#: src/addressbook.c:923
msgid "Sources"
msgstr ""
-#: src/addressbook.c:938 src/prefs_matcher.c:589 src/prefs_other.c:513
-#: src/toolbar.c:207 src/toolbar.c:2044
+#: src/addressbook.c:927 src/prefs_matcher.c:601 src/prefs_other.c:519
+#: src/toolbar.c:210 src/toolbar.c:2084
msgid "Address book"
msgstr ""
-#: src/addressbook.c:1070
+#: src/addressbook.c:1143
msgid "Lookup name:"
msgstr ""
-#: src/addressbook.c:1385 src/addressbook.c:1431 src/addrduplicates.c:801
+#: src/addressbook.c:1485 src/addressbook.c:1538 src/addrduplicates.c:802
msgid "Delete address(es)"
msgstr ""
-#: src/addressbook.c:1386 src/addrduplicates.c:850
+#: src/addressbook.c:1486 src/addrduplicates.c:851
msgid "This address data is readonly and cannot be deleted."
msgstr ""
-#: src/addressbook.c:1425
+#: src/addressbook.c:1530
msgid "Delete group"
msgstr ""
-#: src/addressbook.c:1426
+#: src/addressbook.c:1531
msgid ""
"Really delete the group(s)?\n"
"The addresses it contains will not be lost."
msgstr ""
-#: src/addressbook.c:1432 src/addrduplicates.c:802
+#: src/addressbook.c:1539 src/addrduplicates.c:803
msgid "Really delete the address(es)?"
msgstr ""
-#: src/addressbook.c:2064
+#: src/addressbook.c:2231
msgid "Cannot paste. Target address book is readonly."
msgstr ""
-#: src/addressbook.c:2074
+#: src/addressbook.c:2241
msgid "Cannot paste into an address group."
msgstr ""
-#: src/addressbook.c:2767
+#: src/addressbook.c:2944
#, c-format
msgid "Do you want to delete the query results and addresses in '%s' ?"
msgstr ""
-#: src/addressbook.c:2770 src/addressbook.c:2796 src/addressbook.c:2803
-#: src/prefs_filtering_action.c:163 src/toolbar.c:428
+#: src/addressbook.c:2947 src/addressbook.c:2973 src/addressbook.c:2980
+#: src/prefs_filtering_action.c:164 src/toolbar.c:397
msgid "Delete"
msgstr ""
-#: src/addressbook.c:2779
+#: src/addressbook.c:2956
#, c-format
msgid ""
-"Do you want to delete '%s' ?If you delete the folder only, the addresses it "
+"Do you want to delete '%s' ? If you delete the folder only, the addresses it "
"contains will be moved into the parent folder."
msgstr ""
-#: src/addressbook.c:2782 src/imap_gtk.c:302 src/mh_gtk.c:182
+#: src/addressbook.c:2959 src/imap_gtk.c:364 src/mh_gtk.c:200
msgid "Delete folder"
msgstr ""
-#: src/addressbook.c:2783
+#: src/addressbook.c:2960
msgid "+Delete _folder only"
msgstr ""
-#: src/addressbook.c:2783
+#: src/addressbook.c:2960
msgid "Delete folder and _addresses"
msgstr ""
-#: src/addressbook.c:2794
+#: src/addressbook.c:2971
#, c-format
msgid ""
"Do you want to delete '%s'?\n"
"The addresses it contains will not be lost."
msgstr ""
-#: src/addressbook.c:2801
+#: src/addressbook.c:2978
#, c-format
msgid ""
"Do you want to delete '%s'?\n"
"The addresses it contains will be lost."
msgstr ""
-#: src/addressbook.c:2911
+#: src/addressbook.c:3088
#, c-format
msgid "Search '%s'"
msgstr ""
-#: src/addressbook.c:3049 src/addressbook.c:3098
+#: src/addressbook.c:3226 src/addressbook.c:3275
msgid "New Contacts"
msgstr ""
-#: src/addressbook.c:3878
+#: src/addressbook.c:4056
msgid "New user, could not save index file."
msgstr ""
-#: src/addressbook.c:3882
+#: src/addressbook.c:4060
msgid "New user, could not save address book files."
msgstr ""
-#: src/addressbook.c:3892
+#: src/addressbook.c:4070
msgid "Old address book converted successfully."
msgstr ""
-#: src/addressbook.c:3897
+#: src/addressbook.c:4075
msgid ""
"Old address book converted,\n"
"could not save new address index file."
msgstr ""
-#: src/addressbook.c:3910
+#: src/addressbook.c:4088
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
msgstr ""
-#: src/addressbook.c:3916
+#: src/addressbook.c:4094
msgid ""
"Could not convert address book,\n"
"could not save new address index file."
msgstr ""
-#: src/addressbook.c:3921
+#: src/addressbook.c:4099
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
msgstr ""
-#: src/addressbook.c:3928 src/addressbook.c:3934
+#: src/addressbook.c:4106 src/addressbook.c:4112
msgid "Addressbook conversion error"
msgstr ""
-#: src/addressbook.c:4041
+#: src/addressbook.c:4219
msgid "Addressbook Error"
msgstr ""
-#: src/addressbook.c:4042
+#: src/addressbook.c:4220
msgid "Could not read address index"
msgstr ""
-#: src/addressbook.c:4369
+#: src/addressbook.c:4547
msgid "Busy searching..."
msgstr ""
-#: src/addressbook.c:4631
+#: src/addressbook.c:4809
msgid "Interface"
msgstr ""
-#: src/addressbook.c:4647 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
-#: src/expldifdlg.c:392 src/exporthtml.c:979 src/importldif.c:660
+#: src/addressbook.c:4825 src/addressbook_foldersel.c:184 src/exphtmldlg.c:370
+#: src/expldifdlg.c:387 src/exporthtml.c:979 src/importldif.c:655
msgid "Address Book"
msgstr ""
-#: src/addressbook.c:4663
+#: src/addressbook.c:4841
msgid "Person"
msgstr ""
-#: src/addressbook.c:4711 src/exporthtml.c:879 src/folderview.c:405
-#: src/folderview.c:493 src/prefs_account.c:2517 src/prefs_folder_column.c:81
-#: src/prefs_folder_item.c:1511 src/prefs_folder_item.c:1529
-#: src/prefs_folder_item.c:1546
+#: src/addressbook.c:4889 src/exporthtml.c:879 src/folderview.c:386
+#: src/folderview.c:474 src/prefs_account.c:2644 src/prefs_folder_column.c:77
+#: src/prefs_folder_item.c:1571 src/prefs_folder_item.c:1589
+#: src/prefs_folder_item.c:1606
msgid "Folder"
msgstr ""
-#: src/addressbook.c:4727
+#: src/addressbook.c:4905
msgid "vCard"
msgstr ""
-#: src/addressbook.c:4743 src/addressbook.c:4759
+#: src/addressbook.c:4921 src/addressbook.c:4937
msgid "JPilot"
msgstr ""
-#: src/addressbook.c:4775
+#: src/addressbook.c:4953
msgid "LDAP servers"
msgstr ""
-#: src/addressbook.c:4791
+#: src/addressbook.c:4969
msgid "LDAP Query"
msgstr ""
-#: src/addressbook.c:5113 src/addressbook_foldersel.c:391 src/matcher.c:364
-#: src/matcher.c:1274 src/matcher.c:1407
-#: src/plugins/bogofilter/bogofilter.c:103
-#: src/plugins/bogofilter/bogofilter.c:217
-#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/addressbook_foldersel.c:395 src/plugins/bogofilter/bogofilter.c:103
+#: src/plugins/bogofilter/bogofilter_gtk.c:228
+#: src/plugins/bogofilter/bogofilter_gtk.c:299
+#: src/plugins/bogofilter/bogofilter_gtk.c:376
#: src/plugins/dillo_viewer/dillo_prefs.c:66
-#: src/plugins/dillo_viewer/dillo_prefs.c:199
+#: src/plugins/dillo_viewer/dillo_prefs.c:196
+#: src/plugins/dillo_viewer/dillo_prefs.c:209
+#: src/plugins/dillo_viewer/dillo_prefs.c:212
+#: src/plugins/dillo_viewer/dillo_prefs.c:275
#: src/plugins/dillo_viewer/dillo_viewer.c:123
#: src/plugins/spamassassin/spamassassin.c:116
-#: src/plugins/spamassassin/spamassassin.c:254
-#: src/plugins/spamassassin/spamassassin_gtk.c:449 src/prefs_matcher.c:623
-#: src/prefs_matcher.c:653 src/prefs_matcher.c:1460 src/prefs_matcher.c:1475
-#: src/prefs_matcher.c:1477 src/prefs_matcher.c:2323 src/prefs_matcher.c:2327
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:483
+#: src/plugins/spamassassin/spamassassin_gtk.c:606 src/prefs_matcher.c:636
+#: src/prefs_matcher.c:666 src/prefs_matcher.c:1476 src/prefs_matcher.c:1483
+#: src/prefs_matcher.c:1491 src/prefs_matcher.c:1493 src/prefs_matcher.c:2339
+#: src/prefs_matcher.c:2343
msgid "Any"
msgstr ""
-#: src/addrgather.c:158
+#: src/addrgather.c:147
msgid "Please specify name for address book."
msgstr ""
-#: src/addrgather.c:178
+#: src/addrgather.c:167
msgid "Please select the mail headers to search."
msgstr ""
-#: src/addrgather.c:185
-msgid "Harvesting addresses..."
-msgstr ""
-
-#: src/addrgather.c:224
-msgid "Addresses gathered successfully."
+#: src/addrgather.c:174
+msgid "Collecting addresses..."
msgstr ""
-#: src/addrgather.c:294
-msgid "No folder or message was selected."
+#: src/addrgather.c:213
+msgid "Addresses collected successfully."
msgstr ""
-#: src/addrgather.c:302
-msgid ""
-"Please select a folder to process from the folder\n"
-"list. Alternatively, select one or messages from\n"
-"the message list."
+#: src/addrgather.c:290
+msgid "Current folder:"
msgstr ""
-#: src/addrgather.c:354
-msgid "Folder :"
+#: src/addrgather.c:301
+msgid "Address book name:"
msgstr ""
-#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:629
-#: src/importldif.c:909
-msgid "Address Book :"
+#: src/addrgather.c:311
+msgid "Address book folder size:"
msgstr ""
-#: src/addrgather.c:375
-msgid "Folder Size :"
+#: src/addrgather.c:315 src/addrgather.c:325
+msgid ""
+"Maximum amount of entries per folder within the newly created address book"
msgstr ""
-#: src/addrgather.c:390
+#: src/addrgather.c:329
msgid "Process these mail header fields"
msgstr ""
-#: src/addrgather.c:408
+#: src/addrgather.c:347
msgid "Include subfolders"
msgstr ""
-#: src/addrgather.c:431 src/prefs_filtering_action.c:1350
+#: src/addrgather.c:370 src/prefs_filtering_action.c:1361
msgid "Header Name"
msgstr ""
-#: src/addrgather.c:432
+#: src/addrgather.c:371
msgid "Address Count"
msgstr ""
-#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:5145
-#: src/compose.c:10190 src/messageview.c:690 src/messageview.c:703
-#: src/plugins/pgpcore/sgpgme.c:581 src/summaryview.c:4553
-msgid "Warning"
-msgstr ""
-
-#: src/addrgather.c:538
+#: src/addrgather.c:472
msgid "Header Fields"
msgstr ""
-#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:740
-#: src/importldif.c:1041
+#: src/addrgather.c:473 src/exphtmldlg.c:658 src/expldifdlg.c:723
+#: src/importldif.c:1022
msgid "Finish"
msgstr ""
-#: src/addrgather.c:600
-msgid "Harvest Email Addresses - from Selected Messages"
+#: src/addrgather.c:521
+msgid "Collect email addresses from selected messages"
msgstr ""
-#: src/addrgather.c:608
-msgid "Harvest Email Addresses - from Folder"
+#: src/addrgather.c:525
+msgid "Collect email addresses from folder"
msgstr ""
#: src/addrindex.c:118
@@ -927,28 +858,34 @@ msgid ""
"Claws Mail will now search for duplicate email addresses in the address book."
msgstr ""
-#: src/addrduplicates.c:325
+#: src/addrduplicates.c:324
msgid "No duplicate email addresses found in the address book"
msgstr ""
-#: src/addrduplicates.c:356
+#: src/addrduplicates.c:355
msgid "Duplicate email addresses"
msgstr ""
-#: src/addrduplicates.c:472
+#: src/addrduplicates.c:473
msgid "Address book path"
msgstr ""
-#: src/addrduplicates.c:849
+#: src/addrduplicates.c:850
msgid "Delete address"
msgstr ""
-#: src/alertpanel.c:145 src/compose.c:8185
+#: src/alertpanel.c:145 src/compose.c:8505
msgid "Notice"
msgstr ""
-#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:5085 src/inc.c:649
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:243
+#: src/alertpanel.c:158 src/compose.c:5226 src/compose.c:10584
+#: src/messageview.c:803 src/messageview.c:816
+#: src/plugins/pgpcore/sgpgme.c:592 src/summaryview.c:4811
+msgid "Warning"
+msgstr ""
+
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:5167 src/inc.c:647
+#: src/plugins/pgpcore/sgpgme.c:154 src/plugins/pgpcore/sgpgme.c:245
msgid "Error"
msgstr ""
@@ -960,23 +897,23 @@ msgstr ""
msgid "Show this message next time"
msgstr ""
-#: src/browseldap.c:223
+#: src/browseldap.c:217
msgid "Browse Directory Entry"
msgstr ""
-#: src/browseldap.c:243
+#: src/browseldap.c:237
msgid "Server Name :"
msgstr ""
-#: src/browseldap.c:253
+#: src/browseldap.c:247
msgid "Distinguished Name (dn) :"
msgstr ""
-#: src/browseldap.c:276
+#: src/browseldap.c:270
msgid "LDAP Name"
msgstr ""
-#: src/browseldap.c:278
+#: src/browseldap.c:272
msgid "Attribute Value"
msgstr ""
@@ -1016,51 +953,51 @@ msgstr ""
msgid "things"
msgstr ""
-#: src/common/plugin.c:284
+#: src/common/plugin.c:285
#, c-format
msgid ""
"This plugin provides %s (%s), which is already provided by the %s plugin."
msgstr ""
-#: src/common/plugin.c:323
+#: src/common/plugin.c:324
msgid "Plugin already loaded"
msgstr ""
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
msgid "Failed to allocate memory for Plugin"
msgstr ""
-#: src/common/plugin.c:364
+#: src/common/plugin.c:365
msgid "This module is not licensed under a GPL v2 or later compatible license."
msgstr ""
-#: src/common/plugin.c:373
+#: src/common/plugin.c:374
msgid "This module is for Claws Mail GTK1."
msgstr ""
-#: src/common/plugin.c:613
+#: src/common/plugin.c:616
#, c-format
msgid ""
"Your version of Claws Mail is newer than the version the '%s' plugin was "
"built with."
msgstr ""
-#: src/common/plugin.c:616
+#: src/common/plugin.c:619
msgid ""
"Your version of Claws Mail is newer than the version the plugin was built "
"with."
msgstr ""
-#: src/common/plugin.c:625
+#: src/common/plugin.c:628
#, c-format
msgid "Your version of Claws Mail is too old for the '%s' plugin."
msgstr ""
-#: src/common/plugin.c:627
+#: src/common/plugin.c:630
msgid "Your version of Claws Mail is too old for the plugin."
msgstr ""
-#: src/common/session.c:166 src/imap.c:1098
+#: src/common/session.c:170 src/imap.c:1094
msgid "SSL handshake failed\n"
msgstr ""
@@ -1076,7 +1013,7 @@ msgstr ""
msgid "error occurred on SMTP session\n"
msgstr ""
-#: src/common/smtp.c:548 src/pop.c:891
+#: src/common/smtp.c:548 src/pop.c:892
msgid "error occurred on authentication\n"
msgstr ""
@@ -1085,45 +1022,41 @@ msgstr ""
msgid "Message is too big (Maximum size is %s)\n"
msgstr ""
-#: src/common/smtp.c:635 src/pop.c:884
+#: src/common/smtp.c:635 src/pop.c:885
msgid "couldn't start TLS session\n"
msgstr ""
-#: src/common/socket.c:1426
+#: src/common/socket.c:1474
#, c-format
msgid "write on fd%d: %s\n"
msgstr ""
-#: src/common/ssl.c:214
+#: src/common/ssl.c:358
msgid "Error creating ssl context\n"
msgstr ""
-#: src/common/ssl.c:233
+#: src/common/ssl.c:378
#, c-format
msgid "SSL connect failed (%s)\n"
msgstr ""
-#: src/common/ssl_certificate.c:513
-msgid "Couldn't load X509 default paths"
-msgstr ""
-
-#: src/common/ssl_certificate.c:535
+#: src/common/ssl_certificate.c:651
msgid "Uncheckable"
msgstr ""
-#: src/common/ssl_certificate.c:539
+#: src/common/ssl_certificate.c:655
msgid "Self-signed certificate"
msgstr ""
-#: src/common/ssl_certificate.c:542
+#: src/common/ssl_certificate.c:658
msgid "Revoked certificate"
msgstr ""
-#: src/common/ssl_certificate.c:544
+#: src/common/ssl_certificate.c:660
msgid "No certificate issuer found"
msgstr ""
-#: src/common/ssl_certificate.c:546
+#: src/common/ssl_certificate.c:662
msgid "Certificate issuer is not a CA"
msgstr ""
@@ -1131,739 +1064,595 @@ msgstr ""
msgid "(Subject cleared by RegExp)"
msgstr ""
-#: src/common/utils.c:332
+#: src/common/utils.c:345
#, c-format
msgid "%dB"
msgstr ""
-#: src/common/utils.c:333
+#: src/common/utils.c:346
#, c-format
msgid "%d.%02dKB"
msgstr ""
-#: src/common/utils.c:334
+#: src/common/utils.c:347
#, c-format
msgid "%d.%02dMB"
msgstr ""
-#: src/common/utils.c:335
+#: src/common/utils.c:348
#, c-format
msgid "%.2fGB"
msgstr ""
-#: src/common/utils.c:4698
+#: src/common/utils.c:4797
msgid "Complete day name for use by strftime|Sunday"
msgstr ""
-#: src/common/utils.c:4699
+#: src/common/utils.c:4798
msgid "Complete day name for use by strftime|Monday"
msgstr ""
-#: src/common/utils.c:4700
+#: src/common/utils.c:4799
msgid "Complete day name for use by strftime|Tuesday"
msgstr ""
-#: src/common/utils.c:4701
+#: src/common/utils.c:4800
msgid "Complete day name for use by strftime|Wednesday"
msgstr ""
-#: src/common/utils.c:4702
+#: src/common/utils.c:4801
msgid "Complete day name for use by strftime|Thursday"
msgstr ""
-#: src/common/utils.c:4703
+#: src/common/utils.c:4802
msgid "Complete day name for use by strftime|Friday"
msgstr ""
-#: src/common/utils.c:4704
+#: src/common/utils.c:4803
msgid "Complete day name for use by strftime|Saturday"
msgstr ""
-#: src/common/utils.c:4706
+#: src/common/utils.c:4805
msgid "Complete month name for use by strftime|January"
msgstr ""
-#: src/common/utils.c:4707
+#: src/common/utils.c:4806
msgid "Complete month name for use by strftime|February"
msgstr ""
-#: src/common/utils.c:4708
+#: src/common/utils.c:4807
msgid "Complete month name for use by strftime|March"
msgstr ""
-#: src/common/utils.c:4709
+#: src/common/utils.c:4808
msgid "Complete month name for use by strftime|April"
msgstr ""
-#: src/common/utils.c:4710
+#: src/common/utils.c:4809
msgid "Complete month name for use by strftime|May"
msgstr ""
-#: src/common/utils.c:4711
+#: src/common/utils.c:4810
msgid "Complete month name for use by strftime|June"
msgstr ""
-#: src/common/utils.c:4712
+#: src/common/utils.c:4811
msgid "Complete month name for use by strftime|July"
msgstr ""
-#: src/common/utils.c:4713
+#: src/common/utils.c:4812
msgid "Complete month name for use by strftime|August"
msgstr ""
-#: src/common/utils.c:4714
+#: src/common/utils.c:4813
msgid "Complete month name for use by strftime|September"
msgstr ""
-#: src/common/utils.c:4715
+#: src/common/utils.c:4814
msgid "Complete month name for use by strftime|October"
msgstr ""
-#: src/common/utils.c:4716
+#: src/common/utils.c:4815
msgid "Complete month name for use by strftime|November"
msgstr ""
-#: src/common/utils.c:4717
+#: src/common/utils.c:4816
msgid "Complete month name for use by strftime|December"
msgstr ""
-#: src/common/utils.c:4719
+#: src/common/utils.c:4818
msgid "Abbr. day name for use by strftime|Sun"
msgstr ""
-#: src/common/utils.c:4720
+#: src/common/utils.c:4819
msgid "Abbr. day name for use by strftime|Mon"
msgstr ""
-#: src/common/utils.c:4721
+#: src/common/utils.c:4820
msgid "Abbr. day name for use by strftime|Tue"
msgstr ""
-#: src/common/utils.c:4722
+#: src/common/utils.c:4821
msgid "Abbr. day name for use by strftime|Wed"
msgstr ""
-#: src/common/utils.c:4723
+#: src/common/utils.c:4822
msgid "Abbr. day name for use by strftime|Thu"
msgstr ""
-#: src/common/utils.c:4724
+#: src/common/utils.c:4823
msgid "Abbr. day name for use by strftime|Fri"
msgstr ""
-#: src/common/utils.c:4725
+#: src/common/utils.c:4824
msgid "Abbr. day name for use by strftime|Sat"
msgstr ""
-#: src/common/utils.c:4727
+#: src/common/utils.c:4826
msgid "Abbr. month name for use by strftime|Jan"
msgstr ""
-#: src/common/utils.c:4728
+#: src/common/utils.c:4827
msgid "Abbr. month name for use by strftime|Feb"
msgstr ""
-#: src/common/utils.c:4729
+#: src/common/utils.c:4828
msgid "Abbr. month name for use by strftime|Mar"
msgstr ""
-#: src/common/utils.c:4730
+#: src/common/utils.c:4829
msgid "Abbr. month name for use by strftime|Apr"
msgstr ""
-#: src/common/utils.c:4731
+#: src/common/utils.c:4830
msgid "Abbr. month name for use by strftime|May"
msgstr ""
-#: src/common/utils.c:4732
+#: src/common/utils.c:4831
msgid "Abbr. month name for use by strftime|Jun"
msgstr ""
-#: src/common/utils.c:4733
+#: src/common/utils.c:4832
msgid "Abbr. month name for use by strftime|Jul"
msgstr ""
-#: src/common/utils.c:4734
+#: src/common/utils.c:4833
msgid "Abbr. month name for use by strftime|Aug"
msgstr ""
-#: src/common/utils.c:4735
+#: src/common/utils.c:4834
msgid "Abbr. month name for use by strftime|Sep"
msgstr ""
-#: src/common/utils.c:4736
+#: src/common/utils.c:4835
msgid "Abbr. month name for use by strftime|Oct"
msgstr ""
-#: src/common/utils.c:4737
+#: src/common/utils.c:4836
msgid "Abbr. month name for use by strftime|Nov"
msgstr ""
-#: src/common/utils.c:4738
+#: src/common/utils.c:4837
msgid "Abbr. month name for use by strftime|Dec"
msgstr ""
-#: src/common/utils.c:4740
+#: src/common/utils.c:4848
msgid "For use by strftime (morning)|AM"
msgstr ""
-#: src/common/utils.c:4741
+#: src/common/utils.c:4849
msgid "For use by strftime (afternoon)|PM"
msgstr ""
-#: src/common/utils.c:4742
+#: src/common/utils.c:4850
msgid "For use by strftime (morning, lowercase)|am"
msgstr ""
-#: src/common/utils.c:4743
+#: src/common/utils.c:4851
msgid "For use by strftime (afternoon, lowercase)|pm"
msgstr ""
-#: src/common/utils.c:4745
+#: src/common/utils.c:4858
msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
msgstr ""
-#: src/common/utils.c:4746
+#: src/common/utils.c:4859
msgid "For use by strftime (default date format)|%m/%d/%y"
msgstr ""
-#: src/common/utils.c:4747
+#: src/common/utils.c:4860
msgid "For use by strftime (default time format)|%H:%M:%S"
msgstr ""
-#: src/common/utils.c:4749
+#: src/common/utils.c:4862
msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
msgstr ""
-#: src/compose.c:556
-msgid "/_Add..."
-msgstr ""
-
-#: src/compose.c:557
-msgid "/_Remove"
-msgstr ""
-
-#: src/compose.c:559 src/folderview.c:299
-msgid "/_Properties..."
-msgstr ""
-
-#: src/compose.c:564 src/mainwindow.c:791 src/messageview.c:377
-msgid "/_Message"
-msgstr ""
-
-#: src/compose.c:565
-msgid "/_Message/S_end"
-msgstr ""
-
-#: src/compose.c:567
-msgid "/_Message/Send _later"
-msgstr ""
-
-#: src/compose.c:569 src/compose.c:573 src/compose.c:576 src/mainwindow.c:801
-#: src/mainwindow.c:811 src/mainwindow.c:824 src/mainwindow.c:830
-#: src/mainwindow.c:850 src/messageview.c:380 src/messageview.c:388
-msgid "/_Message/---"
-msgstr ""
-
-#: src/compose.c:570
-msgid "/_Message/_Attach file"
-msgstr ""
-
-#: src/compose.c:571
-msgid "/_Message/_Insert file"
-msgstr ""
-
-#: src/compose.c:572
-msgid "/_Message/Insert si_gnature"
-msgstr ""
-
-#: src/compose.c:574
-msgid "/_Message/_Save"
-msgstr ""
-
-#: src/compose.c:577
-msgid "/_Message/_Close"
-msgstr ""
-
-#: src/compose.c:580
-msgid "/_Edit/_Undo"
-msgstr ""
-
-#: src/compose.c:581
-msgid "/_Edit/_Redo"
-msgstr ""
-
-#: src/compose.c:582 src/compose.c:670 src/compose.c:673 src/compose.c:679
-#: src/mainwindow.c:563 src/messageview.c:229
-msgid "/_Edit/---"
-msgstr ""
-
-#: src/compose.c:583
-msgid "/_Edit/Cu_t"
-msgstr ""
-
-#: src/compose.c:584 src/mainwindow.c:559 src/messageview.c:227
-msgid "/_Edit/_Copy"
-msgstr ""
-
-#: src/compose.c:585
-msgid "/_Edit/_Paste"
-msgstr ""
-
-#: src/compose.c:586
-msgid "/_Edit/Special paste"
-msgstr ""
-
-#: src/compose.c:587
-msgid "/_Edit/Special paste/as _quotation"
-msgstr ""
-
-#: src/compose.c:589
-msgid "/_Edit/Special paste/_wrapped"
-msgstr ""
-
-#: src/compose.c:591
-msgid "/_Edit/Special paste/_unwrapped"
-msgstr ""
-
-#: src/compose.c:593 src/mainwindow.c:560 src/messageview.c:228
-msgid "/_Edit/Select _all"
-msgstr ""
-
-#: src/compose.c:594
-msgid "/_Edit/A_dvanced"
-msgstr ""
-
-#: src/compose.c:595
-msgid "/_Edit/A_dvanced/Move a character backward"
-msgstr ""
-
-#: src/compose.c:600
-msgid "/_Edit/A_dvanced/Move a character forward"
-msgstr ""
-
-#: src/compose.c:605
-msgid "/_Edit/A_dvanced/Move a word backward"
-msgstr ""
-
-#: src/compose.c:610
-msgid "/_Edit/A_dvanced/Move a word forward"
-msgstr ""
-
-#: src/compose.c:615
-msgid "/_Edit/A_dvanced/Move to beginning of line"
-msgstr ""
-
-#: src/compose.c:620
-msgid "/_Edit/A_dvanced/Move to end of line"
-msgstr ""
-
-#: src/compose.c:625
-msgid "/_Edit/A_dvanced/Move to previous line"
-msgstr ""
-
-#: src/compose.c:630
-msgid "/_Edit/A_dvanced/Move to next line"
-msgstr ""
-
-#: src/compose.c:635
-msgid "/_Edit/A_dvanced/Delete a character backward"
-msgstr ""
-
-#: src/compose.c:640
-msgid "/_Edit/A_dvanced/Delete a character forward"
-msgstr ""
-
-#: src/compose.c:645
-msgid "/_Edit/A_dvanced/Delete a word backward"
-msgstr ""
-
-#: src/compose.c:650
-msgid "/_Edit/A_dvanced/Delete a word forward"
-msgstr ""
-
-#: src/compose.c:655
-msgid "/_Edit/A_dvanced/Delete line"
-msgstr ""
-
-#: src/compose.c:660
-msgid "/_Edit/A_dvanced/Delete entire line"
+#: src/compose.c:530
+msgid "_Add..."
msgstr ""
-#: src/compose.c:665
-msgid "/_Edit/A_dvanced/Delete to end of line"
+#: src/compose.c:531 src/mh_gtk.c:362
+msgid "_Remove"
msgstr ""
-#: src/compose.c:671
-msgid "/_Edit/_Find"
+#: src/compose.c:533 src/folderview.c:282
+msgid "_Properties..."
msgstr ""
-#: src/compose.c:674
-msgid "/_Edit/_Wrap current paragraph"
+#: src/compose.c:543
+msgid "_Spelling"
msgstr ""
-#: src/compose.c:676
-msgid "/_Edit/Wrap all long _lines"
+#: src/compose.c:545 src/compose.c:609
+msgid "_Options"
msgstr ""
-#: src/compose.c:678
-msgid "/_Edit/Aut_o wrapping"
+#: src/compose.c:549
+msgid "S_end"
msgstr ""
-#: src/compose.c:680
-msgid "/_Edit/Edit with e_xternal editor"
+#: src/compose.c:550
+msgid "Send _later"
msgstr ""
-#: src/compose.c:683
-msgid "/_Spelling"
+#: src/compose.c:553
+msgid "_Attach file"
msgstr ""
-#: src/compose.c:684
-msgid "/_Spelling/_Check all or check selection"
+#: src/compose.c:554
+msgid "_Insert file"
msgstr ""
-#: src/compose.c:686
-msgid "/_Spelling/_Highlight all misspelled words"
+#: src/compose.c:555
+msgid "Insert si_gnature"
msgstr ""
-#: src/compose.c:688
-msgid "/_Spelling/Check _backwards misspelled word"
+#: src/compose.c:562
+msgid "_Undo"
msgstr ""
-#: src/compose.c:690
-msgid "/_Spelling/_Forward to next misspelled word"
+#: src/compose.c:563
+msgid "_Redo"
msgstr ""
-#: src/compose.c:692
-msgid "/_Spelling/---"
+#: src/compose.c:566
+msgid "Cu_t"
msgstr ""
-#: src/compose.c:693
-msgid "/_Spelling/Options"
+#: src/compose.c:570
+msgid "Special paste"
msgstr ""
-#: src/compose.c:696
-msgid "/_Options"
+#: src/compose.c:571
+msgid "as _quotation"
msgstr ""
-#: src/compose.c:697
-msgid "/_Options/Reply _mode"
+#: src/compose.c:572
+msgid "_wrapped"
msgstr ""
-#: src/compose.c:698
-msgid "/_Options/Reply _mode/_Normal"
+#: src/compose.c:573
+msgid "_unwrapped"
msgstr ""
-#: src/compose.c:699
-msgid "/_Options/Reply _mode/_All"
+#: src/compose.c:575 src/mainwindow.c:494
+msgid "Select _all"
msgstr ""
-#: src/compose.c:700
-msgid "/_Options/Reply _mode/_Sender"
+#: src/compose.c:577
+msgid "A_dvanced"
msgstr ""
-#: src/compose.c:701
-msgid "/_Options/Reply _mode/_Mailing-list"
+#: src/compose.c:578
+msgid "Move a character backward"
msgstr ""
-#: src/compose.c:702 src/compose.c:707 src/compose.c:714 src/compose.c:716
-#: src/compose.c:718
-msgid "/_Options/---"
+#: src/compose.c:579
+msgid "Move a character forward"
msgstr ""
-#: src/compose.c:703
-msgid "/_Options/Privacy _System"
+#: src/compose.c:580
+msgid "Move a word backward"
msgstr ""
-#: src/compose.c:704
-msgid "/_Options/Privacy _System/None"
+#: src/compose.c:581
+msgid "Move a word forward"
msgstr ""
-#: src/compose.c:705
-msgid "/_Options/Si_gn"
+#: src/compose.c:582
+msgid "Move to beginning of line"
msgstr ""
-#: src/compose.c:706
-msgid "/_Options/_Encrypt"
+#: src/compose.c:583
+msgid "Move to end of line"
msgstr ""
-#: src/compose.c:708
-msgid "/_Options/_Priority"
+#: src/compose.c:584
+msgid "Move to previous line"
msgstr ""
-#: src/compose.c:709
-msgid "/_Options/Priority/_Highest"
+#: src/compose.c:585
+msgid "Move to next line"
msgstr ""
-#: src/compose.c:710
-msgid "/_Options/Priority/Hi_gh"
+#: src/compose.c:586
+msgid "Delete a character backward"
msgstr ""
-#: src/compose.c:711
-msgid "/_Options/Priority/_Normal"
+#: src/compose.c:587
+msgid "Delete a character forward"
msgstr ""
-#: src/compose.c:712
-msgid "/_Options/Priority/Lo_w"
+#: src/compose.c:588
+msgid "Delete a word backward"
msgstr ""
-#: src/compose.c:713
-msgid "/_Options/Priority/_Lowest"
+#: src/compose.c:589
+msgid "Delete a word forward"
msgstr ""
-#: src/compose.c:715
-msgid "/_Options/_Request Return Receipt"
+#: src/compose.c:590
+msgid "Delete line"
msgstr ""
-#: src/compose.c:717
-msgid "/_Options/Remo_ve references"
+#: src/compose.c:591
+msgid "Delete to end of line"
msgstr ""
-#: src/compose.c:724
-msgid "/_Options/Character _encoding"
+#: src/compose.c:594 src/messageview.c:207
+msgid "_Find"
msgstr ""
-#: src/compose.c:725
-msgid "/_Options/Character _encoding/_Automatic"
+#: src/compose.c:597
+msgid "_Wrap current paragraph"
msgstr ""
-#: src/compose.c:727 src/compose.c:733
-msgid "/_Options/Character _encoding/---"
+#: src/compose.c:598
+msgid "Wrap all long _lines"
msgstr ""
-#: src/compose.c:729
-msgid "/_Options/Character _encoding/7bit ASCII (US-ASC_II)"
+#: src/compose.c:600
+msgid "Edit with e_xternal editor"
msgstr ""
-#: src/compose.c:731
-msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
+#: src/compose.c:603
+msgid "_Check all or check selection"
msgstr ""
-#: src/compose.c:735
-msgid "/_Options/Character _encoding/Western European"
+#: src/compose.c:604
+msgid "_Highlight all misspelled words"
msgstr ""
-#: src/compose.c:736
-msgid "/_Options/Character _encoding/Western European/ISO-8859-_1"
+#: src/compose.c:605
+msgid "Check _backwards misspelled word"
msgstr ""
-#: src/compose.c:738
-msgid "/_Options/Character _encoding/Western European/ISO-8859-15"
+#: src/compose.c:606
+msgid "_Forward to next misspelled word"
msgstr ""
-#: src/compose.c:740
-msgid "/_Options/Character _encoding/Western European/Windows-1252"
+#: src/compose.c:614
+msgid "Reply _mode"
msgstr ""
-#: src/compose.c:743
-msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
+#: src/compose.c:616
+msgid "Privacy _System"
msgstr ""
-#: src/compose.c:746
-msgid "/_Options/Character _encoding/Baltic"
+#: src/compose.c:621
+msgid "_Priority"
msgstr ""
-#: src/compose.c:747
-msgid "/_Options/Character _encoding/Baltic/ISO-8859-13"
+#: src/compose.c:623 src/mainwindow.c:546 src/messageview.c:233
+msgid "Character _encoding"
msgstr ""
-#: src/compose.c:749
-msgid "/_Options/Character _encoding/Baltic/ISO-8859-_4"
+#: src/compose.c:628 src/mainwindow.c:551 src/messageview.c:238
+msgid "Western European"
msgstr ""
-#: src/compose.c:752
-msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
+#: src/compose.c:629 src/mainwindow.c:552 src/messageview.c:239
+msgid "Baltic"
msgstr ""
-#: src/compose.c:755
-msgid "/_Options/Character _encoding/Hebrew"
+#: src/compose.c:630 src/mainwindow.c:553 src/messageview.c:240
+msgid "Hebrew"
msgstr ""
-#: src/compose.c:756
-msgid "/_Options/Character _encoding/Hebrew/ISO-8859-_8"
+#: src/compose.c:631 src/mainwindow.c:554 src/messageview.c:241
+msgid "Arabic"
msgstr ""
-#: src/compose.c:758
-msgid "/_Options/Character _encoding/Hebrew/Windows-1255"
+#: src/compose.c:632 src/mainwindow.c:555 src/messageview.c:242
+msgid "Cyrillic"
msgstr ""
-#: src/compose.c:761
-msgid "/_Options/Character _encoding/Arabic"
+#: src/compose.c:633 src/mainwindow.c:556 src/messageview.c:243
+msgid "Japanese"
msgstr ""
-#: src/compose.c:762
-msgid "/_Options/Character _encoding/Arabic/ISO-8859-_6"
+#: src/compose.c:634 src/mainwindow.c:557 src/messageview.c:244
+msgid "Chinese"
msgstr ""
-#: src/compose.c:764
-msgid "/_Options/Character _encoding/Arabic/Windows-1256"
+#: src/compose.c:635 src/mainwindow.c:558 src/messageview.c:245
+msgid "Korean"
msgstr ""
-#: src/compose.c:767
-msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
+#: src/compose.c:636 src/mainwindow.c:559 src/messageview.c:246
+msgid "Thai"
msgstr ""
-#: src/compose.c:770
-msgid "/_Options/Character _encoding/Cyrillic"
+#: src/compose.c:639 src/mainwindow.c:651 src/messageview.c:275
+msgid "_Address book"
msgstr ""
-#: src/compose.c:771
-msgid "/_Options/Character _encoding/Cyrillic/ISO-8859-_5"
+#: src/compose.c:641
+msgid "_Template"
msgstr ""
-#: src/compose.c:773
-msgid "/_Options/Character _encoding/Cyrillic/KOI8-_R"
+#: src/compose.c:643 src/mainwindow.c:679 src/messageview.c:296
+msgid "Actio_ns"
msgstr ""
-#: src/compose.c:775
-msgid "/_Options/Character _encoding/Cyrillic/KOI8-U"
+#: src/compose.c:652
+msgid "Aut_o wrapping"
msgstr ""
-#: src/compose.c:777
-msgid "/_Options/Character _encoding/Cyrillic/Windows-1251"
+#: src/compose.c:653
+msgid "Auto _indent"
msgstr ""
-#: src/compose.c:780
-msgid "/_Options/Character _encoding/Japanese"
+#: src/compose.c:654
+msgid "Si_gn"
msgstr ""
-#: src/compose.c:781
-msgid "/_Options/Character _encoding/Japanese/ISO-2022-_JP"
+#: src/compose.c:655
+msgid "_Encrypt"
msgstr ""
-#: src/compose.c:783
-msgid "/_Options/Character _encoding/Japanese/ISO-2022-JP-2"
+#: src/compose.c:656
+msgid "_Request Return Receipt"
msgstr ""
-#: src/compose.c:785
-msgid "/_Options/Character _encoding/Japanese/_EUC-JP"
+#: src/compose.c:657
+msgid "Remo_ve references"
msgstr ""
-#: src/compose.c:787
-msgid "/_Options/Character _encoding/Japanese/_Shift__JIS"
+#: src/compose.c:658
+msgid "Show _ruler"
msgstr ""
-#: src/compose.c:790
-msgid "/_Options/Character _encoding/Chinese"
+#: src/compose.c:663 src/compose.c:673
+msgid "_Normal"
msgstr ""
-#: src/compose.c:791
-msgid "/_Options/Character _encoding/Chinese/Simplified (_GB2312)"
+#: src/compose.c:664
+msgid "_All"
msgstr ""
-#: src/compose.c:793
-msgid "/_Options/Character _encoding/Chinese/Simplified (GBK)"
+#: src/compose.c:665
+msgid "_Sender"
msgstr ""
-#: src/compose.c:795
-msgid "/_Options/Character _encoding/Chinese/Traditional (_Big5)"
+#: src/compose.c:666
+msgid "_Mailing-list"
msgstr ""
-#: src/compose.c:797
-msgid "/_Options/Character _encoding/Chinese/Traditional (EUC-_TW)"
+#: src/compose.c:671
+msgid "_Highest"
msgstr ""
-#: src/compose.c:800
-msgid "/_Options/Character _encoding/Korean"
+#: src/compose.c:672
+msgid "Hi_gh"
msgstr ""
-#: src/compose.c:801
-msgid "/_Options/Character _encoding/Korean/EUC-_KR"
+#: src/compose.c:674
+msgid "Lo_w"
msgstr ""
-#: src/compose.c:803
-msgid "/_Options/Character _encoding/Korean/ISO-2022-KR"
+#: src/compose.c:675
+msgid "_Lowest"
msgstr ""
-#: src/compose.c:806
-msgid "/_Options/Character _encoding/Thai"
+#: src/compose.c:680 src/mainwindow.c:786 src/messageview.c:313
+msgid "_Automatic"
msgstr ""
-#: src/compose.c:807
-msgid "/_Options/Character _encoding/Thai/TIS-620"
+#: src/compose.c:681 src/mainwindow.c:787 src/messageview.c:314
+msgid "7bit ASCII (US-ASC_II)"
msgstr ""
-#: src/compose.c:809
-msgid "/_Options/Character _encoding/Thai/Windows-874"
+#: src/compose.c:682 src/mainwindow.c:788 src/messageview.c:315
+msgid "Unicode (_UTF-8)"
msgstr ""
-#: src/compose.c:813
-msgid "/_Tools/Show _ruler"
+#: src/compose.c:686 src/mainwindow.c:792 src/messageview.c:319
+msgid "Central European (ISO-8859-_2)"
msgstr ""
-#: src/compose.c:814 src/messageview.c:395
-msgid "/_Tools/_Address book"
+#: src/compose.c:689 src/mainwindow.c:795 src/messageview.c:322
+msgid "Greek (ISO-8859-_7)"
msgstr ""
-#: src/compose.c:815
-msgid "/_Tools/_Template"
+#: src/compose.c:694 src/mainwindow.c:800 src/messageview.c:327
+msgid "Turkish (ISO-8859-_9)"
msgstr ""
-#: src/compose.c:816 src/mainwindow.c:890 src/messageview.c:422
-msgid "/_Tools/Actio_ns"
+#: src/compose.c:955 src/quote_fmt.c:566
+msgid "New message From format error."
msgstr ""
-#: src/compose.c:1122 src/quote_fmt.c:421
+#: src/compose.c:1047 src/quote_fmt.c:569
msgid "New message subject format error."
msgstr ""
-#: src/compose.c:1152 src/quote_fmt.c:424
+#: src/compose.c:1077 src/quote_fmt.c:572
#, c-format
msgid "New message body format error at line %d."
msgstr ""
-#: src/compose.c:1347
+#: src/compose.c:1271
msgid "Unable to reply. The original email probably doesn't exist."
msgstr ""
-#: src/compose.c:1538 src/quote_fmt.c:440
+#: src/compose.c:1450 src/quote_fmt.c:589
+msgid "Message reply From format error."
+msgstr ""
+
+#: src/compose.c:1497 src/quote_fmt.c:592
#, c-format
msgid "Message reply format error at line %d."
msgstr ""
-#: src/compose.c:1674 src/quote_fmt.c:456
+#: src/compose.c:1620 src/compose.c:1802 src/quote_fmt.c:609
+msgid "Message forward From format error."
+msgstr ""
+
+#: src/compose.c:1685 src/quote_fmt.c:612
#, c-format
msgid "Message forward format error at line %d."
msgstr ""
-#: src/compose.c:1797
+#: src/compose.c:1844
msgid "Fw: multiple emails"
msgstr ""
-#: src/compose.c:2205
+#: src/compose.c:2263
#, c-format
msgid "Message redirect format error at line %d."
msgstr ""
-#: src/compose.c:2270 src/gtk/headers.h:13
+#: src/compose.c:2327 src/gtk/headers.h:13
msgid "Cc:"
msgstr ""
-#: src/compose.c:2273 src/gtk/headers.h:14
+#: src/compose.c:2330 src/gtk/headers.h:14
msgid "Bcc:"
msgstr ""
-#: src/compose.c:2276 src/gtk/headers.h:11
+#: src/compose.c:2333 src/gtk/headers.h:11
msgid "Reply-To:"
msgstr ""
-#: src/compose.c:2279 src/gtk/headers.h:32
+#: src/compose.c:2336 src/gtk/headers.h:32
msgid "Newsgroups:"
msgstr ""
-#: src/compose.c:2282 src/gtk/headers.h:33
+#: src/compose.c:2339 src/gtk/headers.h:33
msgid "Followup-To:"
msgstr ""
-#: src/compose.c:2286 src/gtk/headers.h:12 src/summary_search.c:363
+#: src/compose.c:2343 src/gtk/headers.h:12 src/summary_search.c:359
msgid "To:"
msgstr ""
-#: src/compose.c:2477
+#: src/compose.c:2534
msgid "Couldn't attach a file (charset conversion failed)."
msgstr ""
-#: src/compose.c:2483
+#: src/compose.c:2540
#, c-format
msgid ""
"The following file has been attached: \n"
@@ -1874,106 +1663,106 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/compose.c:2722
+#: src/compose.c:2779
msgid "Quote mark format error."
msgstr ""
-#: src/compose.c:3336
+#: src/compose.c:3349
#, c-format
msgid "File %s is empty."
msgstr ""
-#: src/compose.c:3340
+#: src/compose.c:3353
#, c-format
msgid "Can't read %s."
msgstr ""
-#: src/compose.c:3367
+#: src/compose.c:3380
#, c-format
msgid "Message: %s"
msgstr ""
-#: src/compose.c:4277
+#: src/compose.c:4360
msgid " [Edited]"
msgstr ""
-#: src/compose.c:4284
+#: src/compose.c:4367
#, c-format
msgid "%s - Compose message%s"
msgstr ""
-#: src/compose.c:4287
+#: src/compose.c:4370
#, c-format
msgid "[no subject] - Compose message%s"
msgstr ""
-#: src/compose.c:4289
+#: src/compose.c:4372
msgid "Compose message"
msgstr ""
-#: src/compose.c:4316 src/messageview.c:725
+#: src/compose.c:4399 src/messageview.c:838
msgid ""
"Account for sending mail is not specified.\n"
"Please select a mail account before sending."
msgstr ""
-#: src/compose.c:4510 src/compose.c:4542 src/compose.c:4584
-#: src/prefs_account.c:3011 src/toolbar.c:419 src/toolbar.c:436
+#: src/compose.c:4590 src/compose.c:4622 src/compose.c:4664
+#: src/prefs_account.c:3140 src/toolbar.c:388 src/toolbar.c:406
msgid "Send"
msgstr ""
-#: src/compose.c:4511
+#: src/compose.c:4591
msgid "The only recipient is the default CC address. Send anyway?"
msgstr ""
-#: src/compose.c:4512 src/compose.c:4544 src/compose.c:4577 src/compose.c:5085
+#: src/compose.c:4592 src/compose.c:4624 src/compose.c:4657 src/compose.c:5167
msgid "+_Send"
msgstr ""
-#: src/compose.c:4543
+#: src/compose.c:4623
msgid "The only recipient is the default BCC address. Send anyway?"
msgstr ""
-#: src/compose.c:4560
+#: src/compose.c:4640
msgid "Recipient is not specified."
msgstr ""
-#: src/compose.c:4579
+#: src/compose.c:4659
msgid "+_Queue"
msgstr ""
-#: src/compose.c:4580
+#: src/compose.c:4660
#, c-format
msgid "Subject is empty. %s"
msgstr ""
-#: src/compose.c:4581
+#: src/compose.c:4661
msgid "Send it anyway?"
msgstr ""
-#: src/compose.c:4582
+#: src/compose.c:4662
msgid "Queue it anyway?"
msgstr ""
-#: src/compose.c:4584 src/toolbar.c:437
+#: src/compose.c:4664 src/toolbar.c:407
msgid "Send later"
msgstr ""
-#: src/compose.c:4632 src/compose.c:8538
+#: src/compose.c:4712 src/compose.c:8842
msgid ""
"Could not queue message for sending:\n"
"\n"
"Charset conversion failed."
msgstr ""
-#: src/compose.c:4635 src/compose.c:8541
+#: src/compose.c:4715 src/compose.c:8845
msgid ""
"Could not queue message for sending:\n"
"\n"
"Couldn't get recipient encryption key."
msgstr ""
-#: src/compose.c:4641 src/compose.c:8535
+#: src/compose.c:4721 src/compose.c:8839
#, c-format
msgid ""
"Could not queue message for sending:\n"
@@ -1981,7 +1770,7 @@ msgid ""
"Signature failed: %s"
msgstr ""
-#: src/compose.c:4644
+#: src/compose.c:4724
#, c-format
msgid ""
"Could not queue message for sending:\n"
@@ -1989,24 +1778,24 @@ msgid ""
"%s."
msgstr ""
-#: src/compose.c:4646
+#: src/compose.c:4726
msgid "Could not queue message for sending."
msgstr ""
-#: src/compose.c:4661 src/compose.c:4721
+#: src/compose.c:4741 src/compose.c:4801
msgid ""
"The message was queued but could not be sent.\n"
"Use \"Send queued messages\" from the main window to retry."
msgstr ""
-#: src/compose.c:4717
+#: src/compose.c:4797
#, c-format
msgid ""
"%s\n"
"Use \"Send queued messages\" from the main window to retry."
msgstr ""
-#: src/compose.c:5082
+#: src/compose.c:5164
#, c-format
msgid ""
"Can't convert the character encoding of the message \n"
@@ -2014,7 +1803,7 @@ msgid ""
"Send it as %s?"
msgstr ""
-#: src/compose.c:5141
+#: src/compose.c:5222
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -2023,146 +1812,153 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:5302
+#: src/compose.c:5383
msgid "Encryption warning"
msgstr ""
-#: src/compose.c:5303
+#: src/compose.c:5384
msgid "+C_ontinue"
msgstr ""
-#: src/compose.c:5358
+#: src/compose.c:5439
msgid "No account for sending mails available!"
msgstr ""
-#: src/compose.c:5368
+#: src/compose.c:5449
msgid "No account for posting news available!"
msgstr ""
-#: src/compose.c:6060
+#: src/compose.c:6158
msgid "Add to address _book"
msgstr ""
-#: src/compose.c:6134
+#: src/compose.c:6235
msgid "Use <tab> to autocomplete from addressbook"
msgstr ""
-#: src/compose.c:6282
+#: src/compose.c:6383
msgid "Mime type"
msgstr ""
-#: src/compose.c:6288 src/compose.c:6591 src/mimeview.c:253
-#: src/plugins/pgpcore/select-keys.c:405 src/prefs_matcher.c:587
-#: src/prefs_summary_column.c:88 src/summaryview.c:550
+#: src/compose.c:6389 src/compose.c:6688 src/mimeview.c:267
+#: src/plugins/pgpcore/select-keys.c:393 src/prefs_matcher.c:599
+#: src/prefs_summary_column.c:84 src/summaryview.c:601
msgid "Size"
msgstr ""
-#: src/compose.c:6358
+#: src/compose.c:6459
msgid "Save Message to "
msgstr ""
-#: src/compose.c:6380 src/editjpilot.c:289 src/editldap.c:536
-#: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:244
-#: src/importpine.c:243 src/plugins/bogofilter/bogofilter_gtk.c:188
-#: src/plugins/bogofilter/bogofilter_gtk.c:210
-#: src/plugins/clamav/clamav_plugin_gtk.c:146
-#: src/plugins/spamassassin/spamassassin_gtk.c:423 src/prefs_spelling.c:198
+#: src/compose.c:6481 src/editjpilot.c:276 src/editldap.c:519
+#: src/editvcard.c:192 src/export.c:162 src/import.c:161 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/bogofilter/bogofilter_gtk.c:186
+#: src/plugins/bogofilter/bogofilter_gtk.c:206
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
msgid "_Browse"
msgstr ""
-#: src/compose.c:6590 src/compose.c:7945
+#: src/compose.c:6687 src/compose.c:8261
msgid "MIME type"
msgstr ""
-#: src/compose.c:6670
+#: src/compose.c:6964
msgid "Hea_der"
msgstr ""
-#: src/compose.c:6675
+#: src/compose.c:6969
msgid "_Attachments"
msgstr ""
-#: src/compose.c:6689
+#: src/compose.c:6983
msgid "Othe_rs"
msgstr ""
-#: src/compose.c:6704 src/gtk/headers.h:18 src/summary_search.c:370
+#: src/compose.c:6998 src/gtk/headers.h:18 src/summary_search.c:366
msgid "Subject:"
msgstr ""
-#: src/compose.c:6913
+#: src/compose.c:7208
#, c-format
msgid ""
"Spell checker could not be started.\n"
"%s"
msgstr ""
-#: src/compose.c:7031
+#: src/compose.c:7319
#, c-format
msgid "From: <i>%s</i>"
msgstr ""
-#: src/compose.c:7065
+#: src/compose.c:7353
msgid "Account to use for this email"
msgstr ""
-#: src/compose.c:7067
+#: src/compose.c:7355
msgid "Sender address to be used"
msgstr ""
-#: src/compose.c:7226
+#: src/compose.c:7518
#, c-format
msgid ""
"The privacy system '%s' cannot be loaded. You will not be able to sign or "
"encrypt this message."
msgstr ""
-#: src/compose.c:7424 src/prefs_template.c:663
+#: src/compose.c:7617
+msgid "_None"
+msgstr ""
+
+#: src/compose.c:7718 src/prefs_template.c:741
#, c-format
msgid "Template body format error at line %d."
msgstr ""
-#: src/compose.c:7535 src/prefs_template.c:702
+#: src/compose.c:7829 src/prefs_template.c:786
+msgid "Template From format error."
+msgstr ""
+
+#: src/compose.c:7847 src/prefs_template.c:792
msgid "Template To format error."
msgstr ""
-#: src/compose.c:7553 src/prefs_template.c:708
+#: src/compose.c:7865 src/prefs_template.c:798
msgid "Template Cc format error."
msgstr ""
-#: src/compose.c:7571 src/prefs_template.c:714
+#: src/compose.c:7883 src/prefs_template.c:804
msgid "Template Bcc format error."
msgstr ""
-#: src/compose.c:7590 src/prefs_template.c:720
+#: src/compose.c:7902 src/prefs_template.c:810
msgid "Template subject format error."
msgstr ""
-#: src/compose.c:7839
+#: src/compose.c:8155
msgid "Invalid MIME type."
msgstr ""
-#: src/compose.c:7854
+#: src/compose.c:8170
msgid "File doesn't exist or is empty."
msgstr ""
-#: src/compose.c:7927
+#: src/compose.c:8243
msgid "Properties"
msgstr ""
-#: src/compose.c:7978
+#: src/compose.c:8294
msgid "Encoding"
msgstr ""
-#: src/compose.c:7998
+#: src/compose.c:8314
msgid "Path"
msgstr ""
-#: src/compose.c:7999
+#: src/compose.c:8315
msgid "File name"
msgstr ""
-#: src/compose.c:8182
+#: src/compose.c:8502
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -2170,19 +1966,19 @@ msgid ""
"process group id: %d"
msgstr ""
-#: src/compose.c:8224
+#: src/compose.c:8544
msgid "Compose: input from monitoring process\n"
msgstr ""
-#: src/compose.c:8505 src/messageview.c:956
+#: src/compose.c:8810 src/messageview.c:1069
msgid "Claws Mail needs network access in order to send this email."
msgstr ""
-#: src/compose.c:8530
+#: src/compose.c:8834
msgid "Could not queue message."
msgstr ""
-#: src/compose.c:8532
+#: src/compose.c:8836
#, c-format
msgid ""
"Could not queue message:\n"
@@ -2190,101 +1986,117 @@ msgid ""
"%s."
msgstr ""
-#: src/compose.c:8692
+#: src/compose.c:8999
msgid "Could not save draft."
msgstr ""
-#: src/compose.c:8696
+#: src/compose.c:9003
msgid "Could not save draft"
msgstr ""
-#: src/compose.c:8697
+#: src/compose.c:9004
msgid ""
"Could not save draft.\n"
"Do you want to cancel exit or discard this email?"
msgstr ""
-#: src/compose.c:8699
+#: src/compose.c:9006
msgid "_Cancel exit"
msgstr ""
-#: src/compose.c:8699
+#: src/compose.c:9006
msgid "_Discard email"
msgstr ""
-#: src/compose.c:8853 src/compose.c:8867
+#: src/compose.c:9160 src/compose.c:9173
msgid "Select file"
msgstr ""
-#: src/compose.c:8880
+#: src/compose.c:9186
#, c-format
msgid "File '%s' could not be read."
msgstr ""
-#: src/compose.c:8882
+#: src/compose.c:9188
#, c-format
msgid ""
"File '%s' contained invalid characters\n"
"for the current encoding, insertion may be incorrect."
msgstr ""
-#: src/compose.c:8935
+#: src/compose.c:9251
msgid "Discard message"
msgstr ""
-#: src/compose.c:8936
+#: src/compose.c:9252
msgid "This message has been modified. Discard it?"
msgstr ""
-#: src/compose.c:8937
+#: src/compose.c:9253
msgid "_Discard"
msgstr ""
-#: src/compose.c:8937
+#: src/compose.c:9253
msgid "_Save to Drafts"
msgstr ""
-#: src/compose.c:8981
+#: src/compose.c:9255
+msgid "Save changes"
+msgstr ""
+
+#: src/compose.c:9256
+msgid "This message has been modified. Save the latest changes?"
+msgstr ""
+
+#: src/compose.c:9257
+msgid "_Don't save"
+msgstr ""
+
+#: src/compose.c:9257
+msgid "+_Save to Drafts"
+msgstr ""
+
+#: src/compose.c:9308
#, c-format
msgid "Do you want to apply the template '%s' ?"
msgstr ""
-#: src/compose.c:8983
+#: src/compose.c:9310
msgid "Apply template"
msgstr ""
-#: src/compose.c:8984
+#: src/compose.c:9311
msgid "_Replace"
msgstr ""
-#: src/compose.c:8984
+#: src/compose.c:9311
msgid "_Insert"
msgstr ""
-#: src/compose.c:9748
+#: src/compose.c:10108
msgid "Insert or attach?"
msgstr ""
-#: src/compose.c:9749
+#: src/compose.c:10109
msgid ""
"Do you want to insert the contents of the file(s) into the message body, or "
"attach it to the email?"
msgstr ""
-#: src/compose.c:9751
+#: src/compose.c:10111
msgid "+_Insert"
msgstr ""
-#: src/compose.c:9751
+#: src/compose.c:10111
msgid "_Attach"
msgstr ""
-#: src/compose.c:9953
+#: src/compose.c:10311
#, c-format
msgid "Quote format error at line %d."
msgstr ""
-#: src/compose.c:10184
+#: src/compose.c:10578
#, c-format
msgid ""
"You are about to reply to %d messages. Opening the windows could take some "
@@ -2311,7 +2123,7 @@ msgstr ""
msgid "Debug log"
msgstr ""
-#: src/crash.c:251 src/toolbar.c:435
+#: src/crash.c:251 src/toolbar.c:404
msgid "Close"
msgstr ""
@@ -2327,11 +2139,11 @@ msgstr ""
msgid "Save crash information"
msgstr ""
-#: src/editaddress.c:159 src/editaddress.c:235
+#: src/editaddress.c:154 src/editaddress.c:230
msgid "Add New Person"
msgstr ""
-#: src/editaddress.c:161
+#: src/editaddress.c:156
msgid ""
"Adding a new person requires at least one of the\n"
"following values to be set:\n"
@@ -2346,7 +2158,7 @@ msgid ""
"Click Cancel to close without saving."
msgstr ""
-#: src/editaddress.c:172
+#: src/editaddress.c:167
msgid ""
"Adding a new person requires at least one of the\n"
"following values to be set:\n"
@@ -2359,117 +2171,118 @@ msgid ""
"Click Cancel to close without saving."
msgstr ""
-#: src/editaddress.c:236
+#: src/editaddress.c:231
msgid "Edit Person Details"
msgstr ""
-#: src/editaddress.c:414
+#: src/editaddress.c:409
msgid "An Email address must be supplied."
msgstr ""
-#: src/editaddress.c:590
+#: src/editaddress.c:585
msgid "A Name and Value must be supplied."
msgstr ""
-#: src/editaddress.c:679
+#: src/editaddress.c:674
msgid "Discard"
msgstr ""
-#: src/editaddress.c:680
+#: src/editaddress.c:675
msgid "Apply"
msgstr ""
-#: src/editaddress.c:710 src/editaddress.c:759
+#: src/editaddress.c:705 src/editaddress.c:754
msgid "Edit Person Data"
msgstr ""
-#: src/editaddress.c:788
+#: src/editaddress.c:783
msgid "Choose a picture"
msgstr ""
-#: src/editaddress.c:807
+#: src/editaddress.c:802
#, c-format
msgid ""
"Failed to import image: \n"
"%s"
msgstr ""
-#: src/editaddress.c:849
-msgid "/_Set picture"
+#: src/editaddress.c:844
+msgid "_Set picture"
msgstr ""
-#: src/editaddress.c:850
-msgid "/_Unset picture"
+#: src/editaddress.c:845
+msgid "_Unset picture"
msgstr ""
-#: src/editaddress.c:905
+#: src/editaddress.c:904
msgid "Photo"
msgstr ""
-#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:524
-#: src/exporthtml.c:756 src/ldif.c:765
+#: src/editaddress.c:958 src/editaddress.c:960 src/expldifdlg.c:516
+#: src/exporthtml.c:756 src/ldif.c:768
msgid "Display Name"
msgstr ""
-#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:773
+#: src/editaddress.c:967 src/editaddress.c:971 src/ldif.c:776
msgid "Last Name"
msgstr ""
-#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:769
+#: src/editaddress.c:968 src/editaddress.c:970 src/ldif.c:772
msgid "First Name"
msgstr ""
-#: src/editaddress.c:975 src/editaddress.c:977
+#: src/editaddress.c:974 src/editaddress.c:976
msgid "Nickname"
msgstr ""
-#: src/editaddress.c:1061 src/editaddress.c:1129
+#: src/editaddress.c:1060 src/editaddress.c:1128
msgid "Alias"
msgstr ""
-#: src/editaddress.c:1271 src/editaddress.c:1336 src/editaddress.c:1352
+#: src/editaddress.c:1270 src/editaddress.c:1335 src/editaddress.c:1351
#: src/prefs_customheader.c:220
msgid "Value"
msgstr ""
-#: src/editaddress.c:1419
+#: src/editaddress.c:1418
msgid "_User Data"
msgstr ""
-#: src/editaddress.c:1420
+#: src/editaddress.c:1419
msgid "_Email Addresses"
msgstr ""
-#: src/editaddress.c:1423 src/editaddress.c:1426
+#: src/editaddress.c:1422 src/editaddress.c:1425
msgid "O_ther Attributes"
msgstr ""
-#: src/editbook.c:113
+#: src/editbook.c:108
msgid "File appears to be OK."
msgstr ""
-#: src/editbook.c:116
+#: src/editbook.c:111
msgid "File does not appear to be a valid address book format."
msgstr ""
-#: src/editbook.c:119 src/editjpilot.c:203 src/editvcard.c:107
+#: src/editbook.c:114 src/editjpilot.c:190 src/editvcard.c:97
msgid "Could not read file."
msgstr ""
-#: src/editbook.c:153 src/editbook.c:266
+#: src/editbook.c:148 src/editbook.c:261
msgid "Edit Addressbook"
msgstr ""
-#: src/editbook.c:182 src/editjpilot.c:277 src/editvcard.c:190
+#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
msgid " Check File "
msgstr ""
-#: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
-#: src/importmutt.c:237 src/importpine.c:236 src/prefs_account.c:1853
+#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1902
+#: src/wizard.c:1338 src/wizard.c:1601
msgid "File"
msgstr ""
-#: src/editbook.c:285
+#: src/editbook.c:280
msgid "Add New Addressbook"
msgstr ""
@@ -2489,111 +2302,111 @@ msgstr ""
msgid "Addresses in Group"
msgstr ""
-#: src/editgroup.c:373
+#: src/editgroup.c:383
msgid "Available Addresses"
msgstr ""
-#: src/editgroup.c:445
+#: src/editgroup.c:455
msgid "Move Email Addresses to or from Group with arrow buttons"
msgstr ""
-#: src/editgroup.c:493
+#: src/editgroup.c:503
msgid "Edit Group Details"
msgstr ""
-#: src/editgroup.c:496
+#: src/editgroup.c:506
msgid "Add New Group"
msgstr ""
-#: src/editgroup.c:546
+#: src/editgroup.c:556
msgid "Edit folder"
msgstr ""
-#: src/editgroup.c:546
+#: src/editgroup.c:556
msgid "Input the new name of folder:"
msgstr ""
-#: src/editgroup.c:549 src/foldersel.c:539 src/imap_gtk.c:155 src/mh_gtk.c:130
+#: src/editgroup.c:559 src/foldersel.c:545 src/imap_gtk.c:192 src/mh_gtk.c:142
msgid "New folder"
msgstr ""
-#: src/editgroup.c:550 src/foldersel.c:540 src/mh_gtk.c:131
+#: src/editgroup.c:560 src/foldersel.c:546 src/mh_gtk.c:143
msgid "Input the name of new folder:"
msgstr ""
-#: src/editjpilot.c:200
+#: src/editjpilot.c:187
msgid "File does not appear to be JPilot format."
msgstr ""
-#: src/editjpilot.c:212
+#: src/editjpilot.c:199
msgid "Select JPilot File"
msgstr ""
-#: src/editjpilot.c:248 src/editjpilot.c:378
+#: src/editjpilot.c:235 src/editjpilot.c:365
msgid "Edit JPilot Entry"
msgstr ""
-#: src/editjpilot.c:294
+#: src/editjpilot.c:281
msgid "Additional e-Mail address item(s)"
msgstr ""
-#: src/editjpilot.c:385
+#: src/editjpilot.c:372
msgid "Add New JPilot Entry"
msgstr ""
-#: src/editldap_basedn.c:143
+#: src/editldap_basedn.c:137
msgid "Edit LDAP - Select Search Base"
msgstr ""
-#: src/editldap_basedn.c:163 src/editldap.c:449
+#: src/editldap_basedn.c:157 src/editldap.c:442
msgid "Hostname"
msgstr ""
-#: src/editldap_basedn.c:173 src/editldap.c:468 src/ssl_manager.c:110
+#: src/editldap_basedn.c:167 src/editldap.c:459 src/ssl_manager.c:110
msgid "Port"
msgstr ""
-#: src/editldap_basedn.c:183 src/editldap.c:518
+#: src/editldap_basedn.c:177 src/editldap.c:503
msgid "Search Base"
msgstr ""
-#: src/editldap_basedn.c:204
+#: src/editldap_basedn.c:198
msgid "Available Search Base(s)"
msgstr ""
-#: src/editldap_basedn.c:294
+#: src/editldap_basedn.c:288
msgid "Could not read Search Base(s) from server - please set manually"
msgstr ""
-#: src/editldap_basedn.c:298 src/editldap.c:285
+#: src/editldap_basedn.c:292 src/editldap.c:280
msgid "Could not connect to server"
msgstr ""
-#: src/editldap.c:156
+#: src/editldap.c:151
msgid "A Name must be supplied."
msgstr ""
-#: src/editldap.c:168
+#: src/editldap.c:163
msgid "A Hostname must be supplied for the server."
msgstr ""
-#: src/editldap.c:181
+#: src/editldap.c:176
msgid "At least one LDAP search attribute should be supplied."
msgstr ""
-#: src/editldap.c:282
+#: src/editldap.c:277
msgid "Connected successfully to server"
msgstr ""
-#: src/editldap.c:340 src/editldap.c:1013
+#: src/editldap.c:335 src/editldap.c:977
msgid "Edit LDAP Server"
msgstr ""
-#: src/editldap.c:444
+#: src/editldap.c:438
msgid "A name that you wish to call the server."
msgstr ""
-#: src/editldap.c:459
+#: src/editldap.c:451
msgid ""
"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
"be appropriate for the \"mydomain.com\" organization. An IP address may also "
@@ -2605,41 +2418,41 @@ msgstr ""
"be used. You may specify \"localhost\" if running an LDAP server on the same "
"computer as Claws Mail."
-#: src/editldap.c:480
+#: src/editldap.c:471
msgid "TLS"
msgstr ""
-#: src/editldap.c:481 src/prefs_account.c:3084
+#: src/editldap.c:472 src/prefs_account.c:3213
msgid "SSL"
msgstr ""
-#: src/editldap.c:485
+#: src/editldap.c:476
msgid ""
"Enable secure connection to the LDAP server via TLS.If connection fails, be "
"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
"TLS_REQCERT fields)."
msgstr ""
-#: src/editldap.c:490
+#: src/editldap.c:480
msgid ""
"Enable secure connection to the LDAP server via SSL.If connection fails, be "
"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
"TLS_REQCERT fields)."
msgstr ""
-#: src/editldap.c:504
+#: src/editldap.c:492
msgid "The port number that the server listens on. Port 389 is the default."
msgstr ""
-#: src/editldap.c:508
+#: src/editldap.c:495
msgid " Check Server "
msgstr ""
-#: src/editldap.c:513
+#: src/editldap.c:499
msgid "Press this button to test the connection to the server."
msgstr ""
-#: src/editldap.c:528
+#: src/editldap.c:512
msgid ""
"This specifies the name of the directory to be searched on the server. "
"Examples include:\n"
@@ -2653,37 +2466,37 @@ msgstr ""
" ou=people,dc=domainname,dc=com\n"
" o=Organisation Name,c=Country\n"
-#: src/editldap.c:541
+#: src/editldap.c:523
msgid ""
"Press this button to lookup the name of available directory names on the "
"server."
msgstr ""
-#: src/editldap.c:599
+#: src/editldap.c:580
msgid "Search Attributes"
msgstr ""
-#: src/editldap.c:609
+#: src/editldap.c:589
msgid ""
"A list of LDAP attribute names that should be searched when attempting to "
"find a name or address."
msgstr ""
-#: src/editldap.c:613
+#: src/editldap.c:592
msgid " Defaults "
msgstr ""
-#: src/editldap.c:618
+#: src/editldap.c:596
msgid ""
"This resets the attribute names to a default value that should find most "
"names and addresses during a name or address search process."
msgstr ""
-#: src/editldap.c:625
+#: src/editldap.c:602
msgid "Max Query Age (secs)"
msgstr ""
-#: src/editldap.c:641
+#: src/editldap.c:617
msgid ""
"This defines the maximum period of time (in seconds) that an address search "
"result is valid for address completion purposes. Search results are stored "
@@ -2697,21 +2510,21 @@ msgid ""
"more memory to cache results."
msgstr ""
-#: src/editldap.c:659
+#: src/editldap.c:634
msgid "Include server in dynamic search"
msgstr ""
-#: src/editldap.c:665
+#: src/editldap.c:639
msgid ""
"Check this option to include this server for dynamic searches when using "
"address completion."
msgstr ""
-#: src/editldap.c:672
+#: src/editldap.c:645
msgid "Match names 'containing' search term"
msgstr ""
-#: src/editldap.c:678
+#: src/editldap.c:650
msgid ""
"Searches for names and addresses can be performed either using \"begins-with"
"\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2720,11 +2533,11 @@ msgid ""
"searches against other address interfaces."
msgstr ""
-#: src/editldap.c:733
+#: src/editldap.c:704
msgid "Bind DN"
msgstr ""
-#: src/editldap.c:743
+#: src/editldap.c:713
msgid ""
"The LDAP user account name to be used to connect to the server. This is "
"usually only used for protected servers. This name is typically formatted "
@@ -2732,280 +2545,284 @@ msgid ""
"performing a search."
msgstr ""
-#: src/editldap.c:751
+#: src/editldap.c:720
msgid "Bind Password"
msgstr ""
-#: src/editldap.c:766
+#: src/editldap.c:734
msgid "The password to be used when connecting as the \"Bind DN\" user."
msgstr ""
-#: src/editldap.c:772
+#: src/editldap.c:739
msgid "Timeout (secs)"
msgstr ""
-#: src/editldap.c:787
+#: src/editldap.c:753
msgid "The timeout period in seconds."
msgstr ""
-#: src/editldap.c:791
+#: src/editldap.c:757
msgid "Maximum Entries"
msgstr ""
-#: src/editldap.c:806
+#: src/editldap.c:771
msgid ""
"The maximum number of entries that should be returned in the search result."
msgstr ""
-#: src/editldap.c:822 src/prefs_account.c:2975
+#: src/editldap.c:786 src/prefs_account.c:3104
msgid "Basic"
msgstr ""
-#: src/editldap.c:823
+#: src/editldap.c:787
msgid "Search"
msgstr ""
-#: src/editldap.c:824 src/gtk/quicksearch.c:590
+#: src/editldap.c:788 src/gtk/quicksearch.c:591
msgid "Extended"
msgstr ""
-#: src/editldap.c:1018
+#: src/editldap.c:982
msgid "Add New LDAP Server"
msgstr ""
-#: src/edittags.c:186 src/matcher.c:915 src/prefs_filtering_action.c:1369
+#: src/edittags.c:186 src/matcher.c:918 src/prefs_filtering_action.c:1380
msgid "Tag"
msgstr ""
-#: src/edittags.c:215
+#: src/edittags.c:214
msgid "Delete tag"
msgstr ""
-#: src/edittags.c:216
+#: src/edittags.c:215
msgid "Do you really want to delete this tag?"
msgstr ""
-#: src/edittags.c:243
+#: src/edittags.c:242
msgid "Delete all tags"
msgstr ""
-#: src/edittags.c:244
+#: src/edittags.c:243
msgid "Do you really want to delete all tags?"
msgstr ""
-#: src/edittags.c:447
+#: src/edittags.c:456
msgid "Tag is not set."
msgstr ""
-#: src/edittags.c:512
+#: src/edittags.c:521
msgid "Dialog title|Apply tags"
msgstr ""
-#: src/edittags.c:526
+#: src/edittags.c:535
msgid "New tag:"
msgstr ""
-#: src/edittags.c:559
+#: src/edittags.c:568
msgid "Please select tags to apply/remove. Changes are immediate."
msgstr ""
-#: src/editvcard.c:104
+#: src/editvcard.c:94
msgid "File does not appear to be vCard format."
msgstr ""
-#: src/editvcard.c:116
+#: src/editvcard.c:106
msgid "Select vCard File"
msgstr ""
-#: src/editvcard.c:161 src/editvcard.c:266
+#: src/editvcard.c:151 src/editvcard.c:256
msgid "Edit vCard Entry"
msgstr ""
-#: src/editvcard.c:271
+#: src/editvcard.c:261
msgid "Add New vCard Entry"
msgstr ""
-#: src/exphtmldlg.c:110
+#: src/exphtmldlg.c:105
msgid "Please specify output directory and file to create."
msgstr ""
-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:108
msgid "Select stylesheet and formatting."
msgstr ""
-#: src/exphtmldlg.c:116 src/expldifdlg.c:118
+#: src/exphtmldlg.c:111 src/expldifdlg.c:113
msgid "File exported successfully."
msgstr ""
-#: src/exphtmldlg.c:181
+#: src/exphtmldlg.c:176
#, c-format
msgid ""
"HTML Output Directory '%s'\n"
"does not exist. OK to create new directory?"
msgstr ""
-#: src/exphtmldlg.c:184 src/expldifdlg.c:194
+#: src/exphtmldlg.c:179 src/expldifdlg.c:189
msgid "Create Directory"
msgstr ""
-#: src/exphtmldlg.c:193
+#: src/exphtmldlg.c:188
#, c-format
msgid ""
"Could not create output directory for HTML file:\n"
"%s"
msgstr ""
-#: src/exphtmldlg.c:195 src/expldifdlg.c:205
+#: src/exphtmldlg.c:190 src/expldifdlg.c:200
msgid "Failed to Create Directory"
msgstr ""
-#: src/exphtmldlg.c:237
+#: src/exphtmldlg.c:232
msgid "Error creating HTML file"
msgstr ""
-#: src/exphtmldlg.c:323
+#: src/exphtmldlg.c:318
msgid "Select HTML output file"
msgstr ""
-#: src/exphtmldlg.c:387
+#: src/exphtmldlg.c:382
msgid "HTML Output File"
msgstr ""
-#: src/exphtmldlg.c:396 src/expldifdlg.c:413 src/export.c:179 src/import.c:178
-#: src/importldif.c:691
+#: src/exphtmldlg.c:391 src/expldifdlg.c:408 src/export.c:169 src/import.c:168
+#: src/importldif.c:682
msgid "B_rowse"
msgstr ""
-#: src/exphtmldlg.c:449
+#: src/exphtmldlg.c:444
msgid "Stylesheet"
msgstr ""
-#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1667
-#: src/gtk/gtkaspell.c:2377 src/mainwindow.c:1177 src/prefs_account.c:866
-#: src/prefs_toolbar.c:701 src/prefs_toolbar.c:1180 src/summaryview.c:5505
+#: src/exphtmldlg.c:452 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1501
+#: src/gtk/gtkaspell.c:2156 src/mainwindow.c:1064 src/prefs_account.c:921
+#: src/prefs_toolbar.c:705 src/prefs_toolbar.c:1184 src/summaryview.c:5766
msgid "None"
msgstr ""
-#: src/exphtmldlg.c:458 src/prefs_other.c:111 src/prefs_other.c:451
+#: src/exphtmldlg.c:453 src/prefs_other.c:113 src/prefs_other.c:453
msgid "Default"
msgstr ""
-#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:148
+#: src/exphtmldlg.c:454 src/plugins/pgpcore/sgpgme.c:150
msgid "Full"
msgstr ""
-#: src/exphtmldlg.c:460
+#: src/exphtmldlg.c:455
msgid "Custom"
msgstr ""
-#: src/exphtmldlg.c:461
+#: src/exphtmldlg.c:456
msgid "Custom-2"
msgstr ""
-#: src/exphtmldlg.c:462
+#: src/exphtmldlg.c:457
msgid "Custom-3"
msgstr ""
-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:458
msgid "Custom-4"
msgstr ""
-#: src/exphtmldlg.c:470
+#: src/exphtmldlg.c:465
msgid "Full Name Format"
msgstr ""
-#: src/exphtmldlg.c:478
+#: src/exphtmldlg.c:473
msgid "First Name, Last Name"
msgstr ""
-#: src/exphtmldlg.c:479
+#: src/exphtmldlg.c:474
msgid "Last Name, First Name"
msgstr ""
-#: src/exphtmldlg.c:486
+#: src/exphtmldlg.c:481
msgid "Color Banding"
msgstr "Colour Banding"
-#: src/exphtmldlg.c:492
+#: src/exphtmldlg.c:487
msgid "Format Email Links"
msgstr ""
-#: src/exphtmldlg.c:498
+#: src/exphtmldlg.c:493
msgid "Format User Attributes"
msgstr ""
-#: src/exphtmldlg.c:553 src/expldifdlg.c:639 src/importldif.c:919
+#: src/exphtmldlg.c:538 src/expldifdlg.c:612 src/importldif.c:890
+msgid "Address Book :"
+msgstr ""
+
+#: src/exphtmldlg.c:548 src/expldifdlg.c:622 src/importldif.c:900
msgid "File Name :"
msgstr ""
-#: src/exphtmldlg.c:563
+#: src/exphtmldlg.c:558
msgid "Open with Web Browser"
msgstr ""
-#: src/exphtmldlg.c:595
+#: src/exphtmldlg.c:590
msgid "Export Address Book to HTML File"
msgstr ""
-#: src/exphtmldlg.c:661 src/expldifdlg.c:738 src/importldif.c:1039
+#: src/exphtmldlg.c:656 src/expldifdlg.c:721 src/importldif.c:1020
msgid "File Info"
msgstr ""
-#: src/exphtmldlg.c:662
+#: src/exphtmldlg.c:657
msgid "Format"
msgstr ""
-#: src/expldifdlg.c:112
+#: src/expldifdlg.c:107
msgid "Please specify output directory and LDIF filename to create."
msgstr ""
-#: src/expldifdlg.c:115
+#: src/expldifdlg.c:110
msgid "Specify parameters to format distinguished name."
msgstr ""
-#: src/expldifdlg.c:191
+#: src/expldifdlg.c:186
#, c-format
msgid ""
"LDIF Output Directory '%s'\n"
"does not exist. OK to create new directory?"
msgstr ""
-#: src/expldifdlg.c:203
+#: src/expldifdlg.c:198
#, c-format
msgid ""
"Could not create output directory for LDIF file:\n"
"%s"
msgstr ""
-#: src/expldifdlg.c:245
+#: src/expldifdlg.c:240
msgid "Suffix was not supplied"
msgstr ""
-#: src/expldifdlg.c:247
+#: src/expldifdlg.c:242
msgid ""
"A suffix is required if data is to be used for an LDAP server. Are you sure "
"you wish to proceed without a suffix?"
msgstr ""
-#: src/expldifdlg.c:265
+#: src/expldifdlg.c:260
msgid "Error creating LDIF file"
msgstr ""
-#: src/expldifdlg.c:340
+#: src/expldifdlg.c:335
msgid "Select LDIF output file"
msgstr ""
-#: src/expldifdlg.c:404
+#: src/expldifdlg.c:399
msgid "LDIF Output File"
msgstr ""
-#: src/expldifdlg.c:435
+#: src/expldifdlg.c:430
msgid ""
"The address book Unique ID is used to create a DN that is formatted similar "
"to:\n"
" uid=102376,ou=people,dc=claws-mail,dc=org"
msgstr ""
-#: src/expldifdlg.c:441
+#: src/expldifdlg.c:436
msgid ""
"The address book Display Name is used to create a DN that is formatted "
"similar to:\n"
@@ -3015,7 +2832,7 @@ msgstr ""
"similar to:\n"
" cn=Joe Bloggs,ou=people,dc=claws-mail,dc=org"
-#: src/expldifdlg.c:447
+#: src/expldifdlg.c:442
msgid ""
"The first Email Address belonging to a person is used to create a DN that is "
"formatted similar to:\n"
@@ -3025,11 +2842,11 @@ msgstr ""
"formatted similar to:\n"
" mail=joe.bloggs@domain.com,ou=people,dc=claws-mail,dc=org"
-#: src/expldifdlg.c:494
+#: src/expldifdlg.c:489
msgid "Suffix"
msgstr ""
-#: src/expldifdlg.c:506
+#: src/expldifdlg.c:499
msgid ""
"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
"entry. Examples include:\n"
@@ -3043,15 +2860,15 @@ msgstr ""
" ou=people,dc=domainname,dc=com\n"
" o=Organisation Name,c=Country\n"
-#: src/expldifdlg.c:515
+#: src/expldifdlg.c:507
msgid "Relative DN"
msgstr ""
-#: src/expldifdlg.c:523
+#: src/expldifdlg.c:515
msgid "Unique ID"
msgstr ""
-#: src/expldifdlg.c:533
+#: src/expldifdlg.c:523
msgid ""
"The LDIF file contains several data records that are usually loaded into an "
"LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3060,11 +2877,11 @@ msgid ""
"available RDN options that will be used to create the DN."
msgstr ""
-#: src/expldifdlg.c:554
+#: src/expldifdlg.c:543
msgid "Use DN attribute if present in data"
msgstr ""
-#: src/expldifdlg.c:561
+#: src/expldifdlg.c:548
msgid ""
"The addressbook may contain entries that were previously imported from an "
"LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3072,53 +2889,53 @@ msgid ""
"above will be used if the DN user attribute is not found."
msgstr ""
-#: src/expldifdlg.c:572
+#: src/expldifdlg.c:558
msgid "Exclude record if no Email Address"
msgstr ""
-#: src/expldifdlg.c:579
+#: src/expldifdlg.c:563
msgid ""
"An addressbook may contain entries without Email Addresses. Check this "
"option to ignore these records."
msgstr ""
-#: src/expldifdlg.c:672
+#: src/expldifdlg.c:655
msgid "Export Address Book to LDIF File"
msgstr ""
-#: src/expldifdlg.c:739
+#: src/expldifdlg.c:722
msgid "Distinguished Name"
msgstr ""
-#: src/export.c:120 src/summaryview.c:7484
+#: src/export.c:110 src/summaryview.c:7845
msgid "Export to mbox file"
msgstr ""
-#: src/export.c:139
+#: src/export.c:129
msgid "Locate the folder to export and specify the mbox file."
msgstr ""
-#: src/export.c:150
+#: src/export.c:140
msgid "Source folder:"
msgstr ""
-#: src/export.c:156 src/import.c:150
+#: src/export.c:146 src/import.c:140
msgid "Mbox file:"
msgstr ""
-#: src/export.c:211
+#: src/export.c:201
msgid "Target mbox filename can't be left empty."
msgstr ""
-#: src/export.c:216
+#: src/export.c:206
msgid "Source folder can't be left empty."
msgstr ""
-#: src/export.c:229
+#: src/export.c:219
msgid "Couldn't find the source folder."
msgstr ""
-#: src/export.c:252
+#: src/export.c:242
msgid "Select exporting file"
msgstr ""
@@ -3126,7 +2943,7 @@ msgstr ""
msgid "Full Name"
msgstr ""
-#: src/exporthtml.c:766 src/importldif.c:1040
+#: src/exporthtml.c:766 src/importldif.c:1021
msgid "Attributes"
msgstr ""
@@ -3150,387 +2967,379 @@ msgstr ""
msgid "Not specified."
msgstr ""
-#: src/folder.c:1388 src/foldersel.c:370 src/prefs_folder_item.c:286
+#: src/folder.c:1442 src/foldersel.c:367 src/prefs_folder_item.c:288
msgid "Inbox"
msgstr ""
-#: src/folder.c:1392 src/foldersel.c:374
+#: src/folder.c:1446 src/foldersel.c:371
msgid "Sent"
msgstr ""
-#: src/folder.c:1396 src/foldersel.c:378 src/prefs_folder_item.c:289
+#: src/folder.c:1450 src/foldersel.c:375 src/prefs_folder_item.c:291
msgid "Queue"
msgstr ""
-#: src/folder.c:1400 src/foldersel.c:382 src/prefs_folder_item.c:290
-#: src/toolbar.c:392 src/toolbar.c:427
+#: src/folder.c:1454 src/foldersel.c:379 src/prefs_folder_item.c:292
+#: src/toolbar.c:361 src/toolbar.c:396
msgid "Trash"
msgstr "Wastebin"
-#: src/folder.c:1404 src/foldersel.c:386 src/prefs_folder_item.c:288
+#: src/folder.c:1458 src/foldersel.c:383 src/prefs_folder_item.c:290
msgid "Drafts"
msgstr ""
-#: src/folder.c:1840
+#: src/folder.c:1894
#, c-format
msgid "Processing (%s)...\n"
msgstr ""
-#: src/folder.c:2991
+#: src/folder.c:3112
#, c-format
msgid "Copying %s to %s...\n"
msgstr ""
-#: src/folder.c:2991
+#: src/folder.c:3112
#, c-format
msgid "Moving %s to %s...\n"
msgstr ""
-#: src/folder.c:3278
+#: src/folder.c:3399
#, c-format
msgid "Updating cache for %s..."
msgstr ""
-#: src/folder.c:4094
+#: src/folder.c:4232
msgid "Processing messages..."
msgstr ""
-#: src/folder.c:4230
+#: src/folder.c:4368
#, c-format
msgid "Synchronising %s for offline use...\n"
msgstr ""
-#: src/foldersel.c:228
+#: src/foldersel.c:221
msgid "Select folder"
msgstr ""
-#: src/foldersel.c:541 src/imap_gtk.c:159 src/mh_gtk.c:132
+#: src/foldersel.c:547 src/imap_gtk.c:196 src/mh_gtk.c:144
msgid "NewFolder"
msgstr ""
-#: src/foldersel.c:549 src/imap_gtk.c:167 src/imap_gtk.c:173
-#: src/imap_gtk.c:225 src/mh_gtk.c:138 src/mh_gtk.c:241
+#: src/foldersel.c:555 src/imap_gtk.c:207 src/imap_gtk.c:213
+#: src/imap_gtk.c:270 src/mh_gtk.c:152 src/mh_gtk.c:259 src/news_gtk.c:314
#, c-format
msgid "'%c' can't be included in folder name."
msgstr ""
-#: src/foldersel.c:559 src/imap_gtk.c:183 src/imap_gtk.c:237 src/mh_gtk.c:148
-#: src/mh_gtk.c:248
+#: src/foldersel.c:565 src/imap_gtk.c:223 src/imap_gtk.c:282 src/mh_gtk.c:162
+#: src/mh_gtk.c:266 src/news_gtk.c:321
#, c-format
msgid "The folder '%s' already exists."
msgstr ""
-#: src/foldersel.c:566 src/imap_gtk.c:189 src/mh_gtk.c:154
+#: src/foldersel.c:572 src/imap_gtk.c:229 src/mh_gtk.c:168
#, c-format
msgid "Can't create the folder '%s'."
msgstr ""
-#: src/folderview.c:295
-msgid "/Mark all re_ad"
+#: src/folderview.c:278
+msgid "Mark all re_ad"
msgstr ""
-#: src/folderview.c:297
-msgid "/R_un processing rules"
+#: src/folderview.c:280
+msgid "R_un processing rules"
msgstr ""
-#: src/folderview.c:298
-msgid "/_Search folder..."
+#: src/folderview.c:281 src/mainwindow.c:499
+msgid "_Search folder..."
msgstr ""
-#: src/folderview.c:300
-msgid "/Process_ing..."
+#: src/folderview.c:283
+msgid "Process_ing..."
msgstr ""
-#: src/folderview.c:305
-msgid "/Empty _trash..."
-msgstr "/Empty was_tebin..."
+#: src/folderview.c:284
+msgid "Empty _trash..."
+msgstr "Empty was_tebin..."
-#: src/folderview.c:310
-msgid "/Send _queue..."
+#: src/folderview.c:285
+msgid "Send _queue..."
msgstr ""
-#: src/folderview.c:447 src/folderview.c:494 src/prefs_folder_column.c:82
-#: src/prefs_matcher.c:365 src/summaryview.c:5764
+#: src/folderview.c:428 src/folderview.c:475 src/prefs_folder_column.c:78
+#: src/prefs_matcher.c:367 src/summaryview.c:6035
msgid "New"
msgstr ""
-#: src/folderview.c:448 src/folderview.c:495 src/prefs_folder_column.c:83
-#: src/prefs_matcher.c:364 src/summaryview.c:5766
+#: src/folderview.c:429 src/folderview.c:476 src/prefs_folder_column.c:79
+#: src/prefs_matcher.c:366 src/summaryview.c:6037
msgid "Unread"
msgstr ""
-#: src/folderview.c:449 src/prefs_folder_column.c:84
+#: src/folderview.c:430 src/prefs_folder_column.c:80
msgid "Total"
msgstr ""
#. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:497 src/summaryview.c:551
+#: src/folderview.c:478 src/summaryview.c:602
msgid "#"
msgstr "No."
-#: src/folderview.c:796
+#: src/folderview.c:789
msgid "Setting folder info..."
msgstr ""
-#: src/folderview.c:859 src/summaryview.c:3813
+#: src/folderview.c:852 src/summaryview.c:4068
msgid "Mark all as read"
msgstr ""
-#: src/folderview.c:860 src/summaryview.c:3814
+#: src/folderview.c:853 src/summaryview.c:4069
msgid "Do you really want to mark all mails in this folder as read ?"
msgstr ""
-#: src/folderview.c:1082 src/imap.c:3911 src/mainwindow.c:4448 src/setup.c:90
+#: src/folderview.c:1075 src/imap.c:3972 src/mainwindow.c:4846 src/setup.c:90
#, c-format
msgid "Scanning folder %s%c%s ..."
msgstr ""
-#: src/folderview.c:1086 src/imap.c:3916 src/mainwindow.c:4453 src/setup.c:95
+#: src/folderview.c:1079 src/imap.c:3977 src/mainwindow.c:4851 src/setup.c:95
#, c-format
msgid "Scanning folder %s ..."
msgstr ""
-#: src/folderview.c:1117
+#: src/folderview.c:1110
msgid "Rebuild folder tree"
msgstr ""
-#: src/folderview.c:1118
+#: src/folderview.c:1111
msgid ""
"Rebuilding the folder tree will remove local caches. Do you want to continue?"
msgstr ""
-#: src/folderview.c:1128
+#: src/folderview.c:1121
msgid "Rebuilding folder tree..."
msgstr ""
-#: src/folderview.c:1130 src/folderview.c:1171
+#: src/folderview.c:1123 src/folderview.c:1164
msgid "Scanning folder tree..."
msgstr ""
-#: src/folderview.c:1262
+#: src/folderview.c:1255
#, c-format
msgid "Couldn't scan folder %s\n"
msgstr ""
-#: src/folderview.c:1316
+#: src/folderview.c:1309
msgid "Checking for new messages in all folders..."
msgstr ""
-#: src/folderview.c:2136
+#: src/folderview.c:2144
#, c-format
msgid "Closing Folder %s..."
msgstr ""
-#: src/folderview.c:2228
+#: src/folderview.c:2239
#, c-format
msgid "Opening Folder %s..."
msgstr ""
-#: src/folderview.c:2246
+#: src/folderview.c:2257
msgid "Folder could not be opened."
msgstr ""
-#: src/folderview.c:2408 src/mainwindow.c:2574
+#: src/folderview.c:2419 src/mainwindow.c:2888 src/mainwindow.c:2892
msgid "Empty trash"
msgstr "Empty wastebin"
-#: src/folderview.c:2409
+#: src/folderview.c:2420
msgid "Delete all messages in trash?"
msgstr "Delete all messages in wastebin?"
-#: src/folderview.c:2410
+#: src/folderview.c:2421
msgid "+_Empty trash"
msgstr "+_Empty wastebin"
-#: src/folderview.c:2454 src/inc.c:1599 src/toolbar.c:2521
+#: src/folderview.c:2465 src/inc.c:1599 src/toolbar.c:2566
msgid "Offline warning"
msgstr ""
-#: src/folderview.c:2455 src/toolbar.c:2522
+#: src/folderview.c:2466 src/toolbar.c:2567
msgid "You're working offline. Override?"
msgstr ""
-#: src/folderview.c:2466 src/toolbar.c:2541
+#: src/folderview.c:2477 src/toolbar.c:2586
msgid "Send queued messages"
msgstr ""
-#: src/folderview.c:2467 src/toolbar.c:2542
+#: src/folderview.c:2478 src/toolbar.c:2587
msgid "Send all queued messages?"
msgstr ""
-#: src/folderview.c:2468 src/messageview.c:691 src/messageview.c:708
-#: src/toolbar.c:2543
+#: src/folderview.c:2479 src/messageview.c:804 src/messageview.c:821
+#: src/toolbar.c:2588
msgid "_Send"
msgstr ""
-#: src/folderview.c:2476 src/toolbar.c:2561
+#: src/folderview.c:2487 src/toolbar.c:2606
msgid "Some errors occurred while sending queued messages."
msgstr ""
-#: src/folderview.c:2479 src/main.c:2202 src/toolbar.c:2564
+#: src/folderview.c:2490 src/main.c:2411 src/toolbar.c:2609
#, c-format
msgid ""
"Some errors occurred while sending queued messages:\n"
"%s"
msgstr ""
-#: src/folderview.c:2561
+#: src/folderview.c:2572
#, c-format
msgid "Do you really want to copy folder '%s' in '%s' ?"
msgstr ""
-#: src/folderview.c:2562
+#: src/folderview.c:2573
#, c-format
msgid "Do you really want to make folder '%s' a subfolder of '%s' ?"
msgstr ""
-#: src/folderview.c:2564
+#: src/folderview.c:2575
msgid "Copy folder"
msgstr ""
-#: src/folderview.c:2564
+#: src/folderview.c:2575
msgid "Move folder"
msgstr ""
-#: src/folderview.c:2575
+#: src/folderview.c:2586
#, c-format
msgid "Copying %s to %s..."
msgstr ""
-#: src/folderview.c:2575
+#: src/folderview.c:2586
#, c-format
msgid "Moving %s to %s..."
msgstr ""
-#: src/folderview.c:2606
+#: src/folderview.c:2617
msgid "Source and destination are the same."
msgstr ""
-#: src/folderview.c:2609
+#: src/folderview.c:2620
msgid "Can't copy a folder to one of its children."
msgstr ""
-#: src/folderview.c:2610
+#: src/folderview.c:2621
msgid "Can't move a folder to one of its children."
msgstr ""
-#: src/folderview.c:2613
+#: src/folderview.c:2624
msgid "A folder cannot be moved between different mailboxes."
msgstr ""
-#: src/folderview.c:2616
+#: src/folderview.c:2627
msgid "Copy failed!"
msgstr ""
-#: src/folderview.c:2616
+#: src/folderview.c:2627
msgid "Move failed!"
msgstr ""
-#: src/folderview.c:2667
+#: src/folderview.c:2678
#, c-format
msgid "Processing configuration for folder %s"
msgstr ""
-#: src/folderview.c:3055 src/summaryview.c:4242 src/summaryview.c:4339
+#: src/folderview.c:3066 src/summaryview.c:4498 src/summaryview.c:4597
msgid "The destination folder can only be used to store subfolders."
msgstr ""
-#: src/gedit-print.c:145 src/messageview.c:1803 src/summaryview.c:4562
-#: src/toolbar.c:194 src/toolbar.c:434
+#: src/gedit-print.c:138 src/messageview.c:2034 src/summaryview.c:4820
+#: src/toolbar.c:196 src/toolbar.c:403
msgid "Print"
msgstr ""
-#: src/gedit-print.c:243
+#: src/gedit-print.c:236
msgid "Preparing pages..."
msgstr ""
-#: src/gedit-print.c:270
+#: src/gedit-print.c:263
#, c-format
msgid "Rendering page %d of %d..."
msgstr ""
-#: src/gedit-print.c:272
+#: src/gedit-print.c:265
#, c-format
msgid "Printing page %d of %d..."
msgstr ""
-#: src/gedit-print.c:294 src/printing.c:349
+#: src/gedit-print.c:287 src/printing.c:350
msgid "Print preview"
msgstr ""
-#: src/gedit-print.c:435
+#: src/gedit-print.c:428
msgid "Page %N of %Q"
msgstr ""
-#: src/grouplistdialog.c:174
+#: src/grouplistdialog.c:160
msgid "Newsgroup subscription"
msgstr ""
-#: src/grouplistdialog.c:190
+#: src/grouplistdialog.c:176
msgid "Select newsgroups for subscription:"
msgstr ""
-#: src/grouplistdialog.c:196
+#: src/grouplistdialog.c:182
msgid "Find groups:"
msgstr ""
-#: src/grouplistdialog.c:204
+#: src/grouplistdialog.c:190
msgid " Search "
msgstr ""
-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:202
msgid "Newsgroup name"
msgstr ""
-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:203
msgid "Messages"
msgstr ""
-#: src/grouplistdialog.c:218
+#: src/grouplistdialog.c:204
msgid "Type"
msgstr ""
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:333
msgid "moderated"
msgstr ""
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:335
msgid "readonly"
msgstr ""
-#: src/grouplistdialog.c:351
+#: src/grouplistdialog.c:337
msgid "unknown"
msgstr ""
-#: src/grouplistdialog.c:420
+#: src/grouplistdialog.c:406
msgid "Can't retrieve newsgroup list."
msgstr ""
-#: src/grouplistdialog.c:457 src/summaryview.c:1474
+#: src/grouplistdialog.c:443 src/summaryview.c:1639
msgid "Done."
msgstr ""
-#: src/grouplistdialog.c:490
+#: src/grouplistdialog.c:476
#, c-format
msgid "%d newsgroups received (%s read)"
msgstr ""
-#: src/gtk/about.c:79 src/textview.c:215
-msgid "/_Open with Web browser"
-msgstr ""
-
-#: src/gtk/about.c:80 src/textview.c:216
-msgid "/Copy this _link"
-msgstr ""
-
-#: src/gtk/about.c:139
+#: src/gtk/about.c:122
msgid ""
"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
"\n"
"For further information visit the Claws Mail website:\n"
msgstr ""
-#: src/gtk/about.c:145
+#: src/gtk/about.c:128
msgid ""
"\n"
"\n"
@@ -3538,23 +3347,23 @@ msgid ""
"donate to the Claws Mail project you can do so at:\n"
msgstr ""
-#: src/gtk/about.c:161
+#: src/gtk/about.c:144
msgid ""
"\n"
"\n"
-"Copyright (C) 1999-2007\n"
+"Copyright (C) 1999-2008\n"
"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
"and the Claws Mail team"
msgstr ""
-#: src/gtk/about.c:164
+#: src/gtk/about.c:147
msgid ""
"\n"
"\n"
"System Information\n"
msgstr ""
-#: src/gtk/about.c:170
+#: src/gtk/about.c:153
#, c-format
msgid ""
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
@@ -3562,7 +3371,7 @@ msgid ""
"Operating System: %s %s (%s)"
msgstr ""
-#: src/gtk/about.c:179
+#: src/gtk/about.c:162
#, c-format
msgid ""
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
@@ -3570,7 +3379,7 @@ msgid ""
"Operating System: %s"
msgstr ""
-#: src/gtk/about.c:188
+#: src/gtk/about.c:171
#, c-format
msgid ""
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
@@ -3578,93 +3387,93 @@ msgid ""
"Operating System: unknown"
msgstr ""
-#: src/gtk/about.c:245 src/prefs_themes.c:713 src/wizard.c:502
+#: src/gtk/about.c:228 src/prefs_themes.c:726 src/wizard.c:542
msgid "The Claws Mail Team"
msgstr ""
-#: src/gtk/about.c:264
+#: src/gtk/about.c:247
msgid "Previous team members"
msgstr ""
-#: src/gtk/about.c:283
+#: src/gtk/about.c:266
msgid "The translation team"
msgstr ""
-#: src/gtk/about.c:302
+#: src/gtk/about.c:285
msgid "Documentation team"
msgstr ""
-#: src/gtk/about.c:321
+#: src/gtk/about.c:304
msgid "Logo"
msgstr ""
-#: src/gtk/about.c:340
+#: src/gtk/about.c:323
msgid "Icons"
msgstr ""
-#: src/gtk/about.c:359
+#: src/gtk/about.c:342
msgid "Contributors"
msgstr ""
-#: src/gtk/about.c:407
+#: src/gtk/about.c:390
msgid "Compiled-in Features\n"
msgstr ""
-#: src/gtk/about.c:423
+#: src/gtk/about.c:406
msgid "compface|adds support for the X-Face header\n"
msgstr ""
-#: src/gtk/about.c:433
-msgid "GNU/aspell|adds support for spell checking\n"
+#: src/gtk/about.c:416
+msgid "Enchant|adds support for spell checking\n"
msgstr ""
-#: src/gtk/about.c:443
+#: src/gtk/about.c:426
msgid "GnuTLS|adds support for encrypted connections to servers\n"
msgstr ""
-#: src/gtk/about.c:453
+#: src/gtk/about.c:436
msgid "GTK+ >= 2.10.0|adds support for a complete print dialog\n"
msgstr "adds support for a complete print dialogue\n"
-#: src/gtk/about.c:463
+#: src/gtk/about.c:446
msgid ""
"IPv6|adds support for IPv6 addresses, the new Internet addressing protocol\n"
msgstr ""
-#: src/gtk/about.c:474
+#: src/gtk/about.c:457
msgid "iconv|allows converting to and from different character sets\n"
msgstr ""
-#: src/gtk/about.c:484
+#: src/gtk/about.c:467
msgid "JPilot|adds support for PalmOS addressbooks\n"
msgstr ""
-#: src/gtk/about.c:494
+#: src/gtk/about.c:477
msgid "LDAP|adds support for LDAP shared addressbooks\n"
msgstr ""
-#: src/gtk/about.c:504
+#: src/gtk/about.c:487
msgid "libetpan|adds support for IMAP and NNTP servers\n"
msgstr ""
-#: src/gtk/about.c:514
+#: src/gtk/about.c:497
msgid "libgnomeprint|adds support for a complete print dialog\n"
msgstr "adds support for a complete print dialogue\n"
-#: src/gtk/about.c:524
+#: src/gtk/about.c:507
msgid "libSM|adds support for session handling\n"
msgstr ""
-#: src/gtk/about.c:534
+#: src/gtk/about.c:517
msgid ""
"NetworkManager|adds support for detection of network connection changes\n"
msgstr ""
-#: src/gtk/about.c:544
+#: src/gtk/about.c:527
msgid "OpenSSL|adds support for encrypted connections to servers\n"
msgstr ""
-#: src/gtk/about.c:576
+#: src/gtk/about.c:559
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -3673,7 +3482,7 @@ msgid ""
"\n"
msgstr ""
-#: src/gtk/about.c:582
+#: src/gtk/about.c:565
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -3682,120 +3491,120 @@ msgid ""
"\n"
msgstr ""
-#: src/gtk/about.c:600
+#: src/gtk/about.c:583
msgid ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see <"
msgstr ""
-#: src/gtk/about.c:605
+#: src/gtk/about.c:588
msgid ""
">. \n"
"\n"
msgstr ""
-#: src/gtk/about.c:608
+#: src/gtk/about.c:591
msgid ""
"This product includes software developed by the OpenSSL Project for use in "
"the OpenSSL Toolkit ("
msgstr ""
-#: src/gtk/about.c:612
+#: src/gtk/about.c:595
msgid ").\n"
msgstr ""
-#: src/gtk/about.c:706
+#: src/gtk/about.c:689
msgid "About Claws Mail"
msgstr ""
-#: src/gtk/about.c:757
+#: src/gtk/about.c:740
msgid ""
-"Copyright (C) 1999-2007\n"
+"Copyright (C) 1999-2008\n"
"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
"and the Claws Mail team"
msgstr ""
-#: src/gtk/about.c:771
+#: src/gtk/about.c:754
msgid "_Info"
msgstr ""
-#: src/gtk/about.c:777
+#: src/gtk/about.c:760
msgid "_Authors"
msgstr ""
-#: src/gtk/about.c:783
+#: src/gtk/about.c:766
msgid "_Features"
msgstr ""
-#: src/gtk/about.c:789
+#: src/gtk/about.c:772
msgid "_License"
msgstr ""
-#: src/gtk/about.c:797
+#: src/gtk/about.c:780
msgid "_Release Notes"
msgstr ""
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:359
+#: src/gtk/colorlabel.c:37 src/prefs_common.c:360
msgid "Orange"
msgstr ""
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:363
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
msgid "Red"
msgstr ""
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:367
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
msgid "Pink"
msgstr ""
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:371
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
msgid "Sky blue"
msgstr ""
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:375
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
msgid "Blue"
msgstr ""
-#: src/gtk/colorlabel.c:53 src/prefs_common.c:379
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
msgid "Green"
msgstr ""
-#: src/gtk/colorlabel.c:54 src/prefs_common.c:383
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
msgid "Brown"
msgstr ""
-#: src/gtk/colorlabel.c:55 src/prefs_common.c:387
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
msgid "Grey"
msgstr ""
-#: src/gtk/colorlabel.c:56 src/prefs_common.c:391
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
msgid "Light brown"
msgstr ""
-#: src/gtk/colorlabel.c:57 src/prefs_common.c:395
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
msgid "Dark red"
msgstr ""
-#: src/gtk/colorlabel.c:58 src/prefs_common.c:399
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
msgid "Dark pink"
msgstr ""
-#: src/gtk/colorlabel.c:59 src/prefs_common.c:403
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
msgid "Steel blue"
msgstr ""
-#: src/gtk/colorlabel.c:60 src/prefs_common.c:407
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
msgid "Gold"
msgstr ""
-#: src/gtk/colorlabel.c:61 src/prefs_common.c:411
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
msgid "Bright green"
msgstr ""
-#: src/gtk/colorlabel.c:62 src/prefs_common.c:415
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
msgid "Magenta"
msgstr ""
-#: src/gtk/colorlabel.c:342
+#: src/gtk/colorlabel.c:331
#, c-format
msgid "Ctrl+%c"
msgstr ""
@@ -3808,226 +3617,224 @@ msgstr ""
msgid "Move folders up or down to change the sort order in the folder list."
msgstr ""
-#: src/gtk/foldersort.c:216 src/toolbar.c:415
+#: src/gtk/foldersort.c:216 src/toolbar.c:384
msgid "Folders"
msgstr ""
-#: src/gtk/gtkaspell.c:644
+#: src/gtk/gtkaspell.c:381 src/gtk/gtkaspell.c:632
msgid "No dictionary selected."
msgstr ""
-#: src/gtk/gtkaspell.c:857 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2138
-msgid "Normal Mode"
+#: src/gtk/gtkaspell.c:405 src/gtk/gtkaspell.c:435
+#, c-format
+msgid "Couldn't initialize %s speller."
msgstr ""
-#: src/gtk/gtkaspell.c:859 src/gtk/gtkaspell.c:1876 src/gtk/gtkaspell.c:2150
-msgid "Bad Spellers Mode"
+#: src/gtk/gtkaspell.c:682
+msgid "Couldn't initialize Enchant broker."
msgstr ""
-#: src/gtk/gtkaspell.c:898
-msgid "Unknown suggestion mode."
+#: src/gtk/gtkaspell.c:687
+#, c-format
+msgid "Couldn't initialize %s dictionary:"
msgstr ""
-#: src/gtk/gtkaspell.c:1189
+#: src/gtk/gtkaspell.c:1028
msgid "No misspelled word found."
msgstr ""
-#: src/gtk/gtkaspell.c:1537
+#: src/gtk/gtkaspell.c:1368
msgid "Replace unknown word"
msgstr ""
-#: src/gtk/gtkaspell.c:1552
+#: src/gtk/gtkaspell.c:1385
#, c-format
msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
msgstr ""
-#: src/gtk/gtkaspell.c:1597
+#: src/gtk/gtkaspell.c:1431
msgid ""
"Holding down Control key while pressing Enter\n"
"will learn from mistake.\n"
msgstr ""
-#: src/gtk/gtkaspell.c:1874 src/gtk/gtkaspell.c:2126
-msgid "Fast Mode"
-msgstr ""
-
-#: src/gtk/gtkaspell.c:1944
+#: src/gtk/gtkaspell.c:1742
#, c-format
msgid "\"%s\" unknown in %s"
msgstr ""
-#: src/gtk/gtkaspell.c:1958
+#: src/gtk/gtkaspell.c:1756
msgid "Accept in this session"
msgstr ""
-#: src/gtk/gtkaspell.c:1968
+#: src/gtk/gtkaspell.c:1766
msgid "Add to personal dictionary"
msgstr ""
-#: src/gtk/gtkaspell.c:1978
+#: src/gtk/gtkaspell.c:1776
msgid "Replace with..."
msgstr ""
-#: src/gtk/gtkaspell.c:1991
+#: src/gtk/gtkaspell.c:1789
#, c-format
msgid "Check with %s"
msgstr ""
-#: src/gtk/gtkaspell.c:2013
+#: src/gtk/gtkaspell.c:1811
msgid "(no suggestions)"
msgstr ""
-#: src/gtk/gtkaspell.c:2024 src/gtk/gtkaspell.c:2203
+#: src/gtk/gtkaspell.c:1822 src/gtk/gtkaspell.c:1960
msgid "More..."
msgstr ""
-#: src/gtk/gtkaspell.c:2088
+#: src/gtk/gtkaspell.c:1885
#, c-format
msgid "Dictionary: %s"
msgstr ""
-#: src/gtk/gtkaspell.c:2101
+#: src/gtk/gtkaspell.c:1898
#, c-format
msgid "Use alternate (%s)"
msgstr ""
-#: src/gtk/gtkaspell.c:2112
+#: src/gtk/gtkaspell.c:1909
msgid "Use both dictionaries"
msgstr ""
-#: src/gtk/gtkaspell.c:2166 src/prefs_spelling.c:205
+#: src/gtk/gtkaspell.c:1923 src/prefs_spelling.c:141
msgid "Check while typing"
msgstr ""
-#: src/gtk/gtkaspell.c:2182
+#: src/gtk/gtkaspell.c:1939
msgid "Change dictionary"
msgstr ""
-#: src/gtk/gtkaspell.c:2313
+#: src/gtk/gtkaspell.c:2078
#, c-format
msgid ""
"The spell checker could not change dictionary.\n"
"%s"
msgstr ""
-#: src/gtk/gtkaspell.c:2355
+#: src/gtk/gtkaspell.c:2134
#, c-format
msgid ""
"The spell checker could not change the alternate dictionary.\n"
"%s"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:270
+#: src/gtk/gtksourceprintjob.c:269
msgid "Configuration"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:271
+#: src/gtk/gtksourceprintjob.c:270
msgid "Configuration options for the print job"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:278
+#: src/gtk/gtksourceprintjob.c:277
msgid "Source Buffer"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:279
+#: src/gtk/gtksourceprintjob.c:278
msgid "GtkTextBuffer object to print"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:285
+#: src/gtk/gtksourceprintjob.c:284
msgid "Tabs Width"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:286
+#: src/gtk/gtksourceprintjob.c:285
msgid "Width in equivalent space characters of tabs"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:293
+#: src/gtk/gtksourceprintjob.c:292
msgid "Wrap Mode"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:294
+#: src/gtk/gtksourceprintjob.c:293
msgid "Word wrapping mode"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:301
+#: src/gtk/gtksourceprintjob.c:300
msgid "Highlight"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:302
+#: src/gtk/gtksourceprintjob.c:301
msgid "Whether to print the document with highlighted syntax"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:310
+#: src/gtk/gtksourceprintjob.c:309
msgid "Font"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:311
+#: src/gtk/gtksourceprintjob.c:310
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:318
+#: src/gtk/gtksourceprintjob.c:317
msgid "Font Description"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:319
+#: src/gtk/gtksourceprintjob.c:318
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:326 src/gtk/gtksourceprintjob.c:334
+#: src/gtk/gtksourceprintjob.c:325 src/gtk/gtksourceprintjob.c:333
msgid "Numbers Font"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:327
+#: src/gtk/gtksourceprintjob.c:326
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:335
+#: src/gtk/gtksourceprintjob.c:334
msgid "Font description to use for the line numbers"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:342
+#: src/gtk/gtksourceprintjob.c:341
msgid "Print Line Numbers"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:343
+#: src/gtk/gtksourceprintjob.c:342
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:350
+#: src/gtk/gtksourceprintjob.c:349
msgid "Print Header"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:351
+#: src/gtk/gtksourceprintjob.c:350
msgid "Whether to print a header in each page"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:358
+#: src/gtk/gtksourceprintjob.c:357
msgid "Print Footer"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:359
+#: src/gtk/gtksourceprintjob.c:358
msgid "Whether to print a footer in each page"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:366
+#: src/gtk/gtksourceprintjob.c:365
msgid "Header and Footer Font"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:367
+#: src/gtk/gtksourceprintjob.c:366
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:374
+#: src/gtk/gtksourceprintjob.c:373
msgid "Header and Footer Font Description"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:375
+#: src/gtk/gtksourceprintjob.c:374
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
msgstr ""
-#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1195
-#: src/prefs_matcher.c:1988 src/prefs_summary_column.c:87 src/quote_fmt.c:48
-#: src/summaryview.c:549
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1206
+#: src/prefs_matcher.c:2004 src/prefs_summary_column.c:83 src/quote_fmt.c:48
+#: src/summaryview.c:600
msgid "Date"
msgstr ""
@@ -4035,17 +3842,18 @@ msgstr ""
msgid "Date:"
msgstr ""
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1192
-#: src/prefs_matcher.c:1985 src/prefs_summary_column.c:85 src/quote_fmt.c:49
-#: src/summaryview.c:547
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1203
+#: src/prefs_matcher.c:2001 src/prefs_summary_column.c:81
+#: src/prefs_template.c:79 src/quote_fmt.c:49 src/quote_fmt.c:167
+#: src/quote_fmt.c:295 src/quote_fmt.c:427 src/summaryview.c:598
msgid "From"
msgstr ""
-#: src/gtk/headers.h:9 src/summary_search.c:356
+#: src/gtk/headers.h:9 src/summary_search.c:352
msgid "From:"
msgstr ""
-#: src/gtk/headers.h:10 src/toolbar.c:424
+#: src/gtk/headers.h:10 src/toolbar.c:393
msgid "Sender"
msgstr ""
@@ -4053,28 +3861,28 @@ msgstr ""
msgid "Sender:"
msgstr ""
-#: src/gtk/headers.h:11 src/prefs_account.c:1932
+#: src/gtk/headers.h:11 src/prefs_account.c:1981
msgid "Reply-To"
msgstr ""
-#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1193
-#: src/prefs_matcher.c:1986 src/prefs_summary_column.c:86
-#: src/prefs_template.c:212 src/quote_fmt.c:56 src/summaryview.c:548
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1204
+#: src/prefs_matcher.c:2002 src/prefs_summary_column.c:82
+#: src/prefs_template.c:81 src/quote_fmt.c:56 src/summaryview.c:599
msgid "To"
msgstr ""
-#: src/gtk/headers.h:13 src/prefs_account.c:1906
-#: src/prefs_filtering_action.c:1194 src/prefs_matcher.c:1987
-#: src/prefs_template.c:213 src/quote_fmt.c:57
+#: src/gtk/headers.h:13 src/prefs_account.c:1955
+#: src/prefs_filtering_action.c:1205 src/prefs_matcher.c:2003
+#: src/prefs_template.c:82 src/quote_fmt.c:57
msgid "Cc"
msgstr ""
-#: src/gtk/headers.h:14 src/prefs_account.c:1919 src/prefs_template.c:214
+#: src/gtk/headers.h:14 src/prefs_account.c:1968 src/prefs_template.c:83
msgid "Bcc"
msgstr ""
-#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1196
-#: src/prefs_matcher.c:1989 src/quote_fmt.c:60
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1207
+#: src/prefs_matcher.c:2005 src/quote_fmt.c:60
msgid "Message-ID"
msgstr ""
@@ -4090,8 +3898,8 @@ msgstr ""
msgid "In-Reply-To:"
msgstr ""
-#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1198
-#: src/prefs_matcher.c:1991 src/quote_fmt.c:59
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1209
+#: src/prefs_matcher.c:2007 src/quote_fmt.c:59
msgid "References"
msgstr ""
@@ -4099,10 +3907,10 @@ msgstr ""
msgid "References:"
msgstr ""
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1191
-#: src/prefs_matcher.c:1984 src/prefs_summary_column.c:84
-#: src/prefs_template.c:215 src/quote_fmt.c:55 src/quote_fmt.c:154
-#: src/summaryview.c:546
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1202
+#: src/prefs_matcher.c:2000 src/prefs_summary_column.c:80
+#: src/prefs_template.c:84 src/quote_fmt.c:55 src/quote_fmt.c:186
+#: src/summaryview.c:597
msgid "Subject"
msgstr ""
@@ -4194,8 +4002,8 @@ msgstr ""
msgid "Received:"
msgstr ""
-#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1197
-#: src/prefs_matcher.c:1990 src/quote_fmt.c:58
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1208
+#: src/prefs_matcher.c:2006 src/quote_fmt.c:58
msgid "Newsgroups"
msgstr ""
@@ -4219,13 +4027,13 @@ msgstr ""
msgid "Seen:"
msgstr ""
-#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
-#: src/gtk/sslcertwindow.c:226 src/prefs_summary_column.c:82
-#: src/summaryview.c:2614
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:137
+#: src/gtk/sslcertwindow.c:232 src/prefs_summary_column.c:78
+#: src/summaryview.c:2818
msgid "Status"
msgstr ""
-#: src/gtk/headers.h:36 src/prefs_themes.c:923
+#: src/gtk/headers.h:36 src/prefs_themes.c:936
msgid "Status:"
msgstr ""
@@ -4265,7 +4073,7 @@ msgstr ""
msgid "Content-Type"
msgstr ""
-#: src/gtk/headers.h:41 src/image_viewer.c:329
+#: src/gtk/headers.h:41 src/image_viewer.c:326
msgid "Content-Type:"
msgstr ""
@@ -4293,7 +4101,7 @@ msgstr ""
msgid "Precedence:"
msgstr ""
-#: src/gtk/headers.h:45 src/prefs_account.c:987
+#: src/gtk/headers.h:45 src/prefs_account.c:1042
msgid "Organization"
msgstr "Organisation"
@@ -4421,133 +4229,148 @@ msgstr ""
msgid "From, To or Subject:"
msgstr ""
-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:62
msgid "New message"
msgstr ""
-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:63
msgid "Unread message"
msgstr ""
-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:64
msgid "Message has been replied to"
msgstr ""
-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:65
msgid "Message has been forwarded"
msgstr ""
-#: src/gtk/icon_legend.c:72
+#: src/gtk/icon_legend.c:66
msgid "Message is in an ignored thread"
msgstr ""
-#: src/gtk/icon_legend.c:73
+#: src/gtk/icon_legend.c:67
msgid "Message is in a watched thread"
msgstr ""
-#: src/gtk/icon_legend.c:74
+#: src/gtk/icon_legend.c:68
msgid "Message is spam"
msgstr ""
-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:70
msgid "Message has attachment(s)"
msgstr ""
-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:71
msgid "Digitally signed message"
msgstr ""
-#: src/gtk/icon_legend.c:78
+#: src/gtk/icon_legend.c:72
msgid "Encrypted message"
msgstr ""
-#: src/gtk/icon_legend.c:79
+#: src/gtk/icon_legend.c:73
msgid "Message is signed and has attachment(s)"
msgstr ""
-#: src/gtk/icon_legend.c:80
+#: src/gtk/icon_legend.c:74
msgid "Message is encrypted and has attachment(s)"
msgstr ""
-#: src/gtk/icon_legend.c:82
+#: src/gtk/icon_legend.c:76
msgid "Marked message"
msgstr ""
-#: src/gtk/icon_legend.c:83
+#: src/gtk/icon_legend.c:77
msgid "Message is marked for deletion"
msgstr ""
-#: src/gtk/icon_legend.c:84
+#: src/gtk/icon_legend.c:78
msgid "Message is marked for moving"
msgstr ""
-#: src/gtk/icon_legend.c:85
+#: src/gtk/icon_legend.c:79
msgid "Message is marked for copying"
msgstr ""
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:81
msgid "Locked message"
msgstr ""
-#: src/gtk/icon_legend.c:89
+#: src/gtk/icon_legend.c:83
msgid "Folder (normal, opened)"
msgstr ""
-#: src/gtk/icon_legend.c:90
+#: src/gtk/icon_legend.c:84
msgid "Folder with read messages hidden"
msgstr ""
-#: src/gtk/icon_legend.c:91
+#: src/gtk/icon_legend.c:85
msgid "Folder contains marked messages"
msgstr ""
-#: src/gtk/icon_legend.c:125
+#: src/gtk/icon_legend.c:119
msgid "Icon Legend"
msgstr ""
-#: src/gtk/icon_legend.c:143
+#: src/gtk/icon_legend.c:137
msgid ""
"<span weight=\"bold\">The following icons are used to show the status of "
"messages and folders:</span>"
msgstr ""
-#: src/gtk/inputdialog.c:188
+#: src/gtk/inputdialog.c:245 src/gtk/inputdialog.c:267
#, c-format
msgid "Input password for %s on %s:"
msgstr ""
-#: src/gtk/inputdialog.c:190
+#: src/gtk/inputdialog.c:248 src/gtk/inputdialog.c:251
+#: src/gtk/inputdialog.c:270 src/gtk/inputdialog.c:273
+#, c-format
+msgid "Input password for %s:"
+msgstr ""
+
+#: src/gtk/inputdialog.c:254 src/gtk/inputdialog.c:276
+msgid "Input password:"
+msgstr ""
+
+#: src/gtk/inputdialog.c:255 src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:295
msgid "Input password"
msgstr ""
-#: src/gtk/inputdialog.c:277
+#: src/gtk/inputdialog.c:285
+msgid "Remember password for this session"
+msgstr ""
+
+#: src/gtk/inputdialog.c:383 src/gtk/inputdialog.c:432
msgid "Remember this"
msgstr ""
-#: src/gtk/logwindow.c:445
+#: src/gtk/logwindow.c:446
msgid "Clear _Log"
msgstr ""
-#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163
+#: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
msgid ""
"\n"
"\n"
"Version: "
msgstr ""
-#: src/gtk/pluginwindow.c:161
+#: src/gtk/pluginwindow.c:167
msgid "Error: "
msgstr ""
-#: src/gtk/pluginwindow.c:162
+#: src/gtk/pluginwindow.c:168
msgid "Plugin is not functional."
msgstr ""
-#: src/gtk/pluginwindow.c:193
+#: src/gtk/pluginwindow.c:201
msgid "Select the Plugins to load"
msgstr ""
-#: src/gtk/pluginwindow.c:208
+#: src/gtk/pluginwindow.c:216
#, c-format
msgid ""
"The following error occurred while loading %s :\n"
@@ -4555,264 +4378,263 @@ msgid ""
"%s\n"
msgstr ""
-#: src/gtk/pluginwindow.c:297 src/plugins/bogofilter/bogofilter_gtk.c:429
-#: src/plugins/clamav/clamav_plugin_gtk.c:211
+#: src/gtk/pluginwindow.c:305 src/plugins/bogofilter/bogofilter_gtk.c:450
#: src/plugins/dillo_viewer/dillo_prefs.c:124
-#: src/plugins/pgpcore/prefs_gpg.c:556
-#: src/plugins/spamassassin/spamassassin_gtk.c:634
+#: src/plugins/pgpcore/prefs_gpg.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:641
#: src/plugins/trayicon/trayicon_prefs.c:68
msgid "Plugins"
msgstr ""
-#: src/gtk/pluginwindow.c:330
+#: src/gtk/pluginwindow.c:338
msgid "Load..."
msgstr ""
-#: src/gtk/pluginwindow.c:331
+#: src/gtk/pluginwindow.c:339
msgid "Unload"
msgstr ""
-#: src/gtk/pluginwindow.c:344 src/prefs_summaries.c:218
+#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:220
msgid "Description"
msgstr ""
-#: src/gtk/pluginwindow.c:366
+#: src/gtk/pluginwindow.c:374
msgid "More plugins are available from the Claws Mail website."
msgstr ""
-#: src/gtk/pluginwindow.c:372 src/prefs_themes.c:862
+#: src/gtk/pluginwindow.c:380 src/prefs_themes.c:875
msgid "Get more..."
msgstr ""
-#: src/gtk/pluginwindow.c:410
+#: src/gtk/pluginwindow.c:415
msgid "Click here to load one or more plugins"
msgstr ""
-#: src/gtk/pluginwindow.c:414
+#: src/gtk/pluginwindow.c:418
msgid "Unload the selected plugin"
msgstr ""
-#: src/gtk/pluginwindow.c:479
+#: src/gtk/pluginwindow.c:483
msgid "Loaded plugins"
msgstr ""
-#: src/gtk/prefswindow.c:659
+#: src/gtk/prefswindow.c:672
msgid "Page Index"
msgstr ""
-#: src/gtk/progressdialog.c:140 src/prefs_account.c:2974
-#: src/prefs_account.c:2992 src/prefs_account.c:3010 src/prefs_account.c:3028
-#: src/prefs_account.c:3046 src/prefs_account.c:3064 src/prefs_account.c:3083
-#: src/prefs_account.c:3102 src/prefs_filtering_action.c:1346
-#: src/prefs_filtering.c:391 src/prefs_filtering.c:1893
+#: src/gtk/progressdialog.c:129 src/prefs_account.c:3103
+#: src/prefs_account.c:3121 src/prefs_account.c:3139 src/prefs_account.c:3157
+#: src/prefs_account.c:3175 src/prefs_account.c:3193 src/prefs_account.c:3212
+#: src/prefs_account.c:3294 src/prefs_filtering_action.c:1357
+#: src/prefs_filtering.c:392 src/prefs_filtering.c:1926
msgid "Account"
msgstr ""
-#: src/gtk/quicksearch.c:414
+#: src/gtk/quicksearch.c:415
msgid "all messages"
msgstr ""
-#: src/gtk/quicksearch.c:415
+#: src/gtk/quicksearch.c:416
msgid "messages whose age is greater than #"
msgstr ""
-#: src/gtk/quicksearch.c:416
+#: src/gtk/quicksearch.c:417
msgid "messages whose age is less than #"
msgstr ""
-#: src/gtk/quicksearch.c:417
+#: src/gtk/quicksearch.c:418
msgid "messages which contain S in the message body"
msgstr ""
-#: src/gtk/quicksearch.c:418
+#: src/gtk/quicksearch.c:419
msgid "messages which contain S in the whole message"
msgstr ""
-#: src/gtk/quicksearch.c:419
+#: src/gtk/quicksearch.c:420
msgid "messages carbon-copied to S"
msgstr ""
-#: src/gtk/quicksearch.c:420
+#: src/gtk/quicksearch.c:421
msgid "message is either to: or cc: to S"
msgstr ""
-#: src/gtk/quicksearch.c:421
+#: src/gtk/quicksearch.c:422
msgid "deleted messages"
msgstr ""
-#: src/gtk/quicksearch.c:422
+#: src/gtk/quicksearch.c:423
msgid "messages which contain S in the Sender field"
msgstr ""
-#: src/gtk/quicksearch.c:423
+#: src/gtk/quicksearch.c:424
msgid "true if execute \"S\" succeeds"
msgstr ""
-#: src/gtk/quicksearch.c:424
+#: src/gtk/quicksearch.c:425
msgid "messages originating from user S"
msgstr ""
-#: src/gtk/quicksearch.c:425
+#: src/gtk/quicksearch.c:426
msgid "forwarded messages"
msgstr ""
-#: src/gtk/quicksearch.c:426
+#: src/gtk/quicksearch.c:427
msgid "messages which contain header S"
msgstr ""
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:428
msgid "messages which contain S in Message-ID header"
msgstr ""
-#: src/gtk/quicksearch.c:428
+#: src/gtk/quicksearch.c:429
msgid "messages which contain S in In-Reply-To header"
msgstr ""
-#: src/gtk/quicksearch.c:429
+#: src/gtk/quicksearch.c:430
msgid "messages which are marked with color #"
msgstr "messages which are marked with colour #"
-#: src/gtk/quicksearch.c:430
+#: src/gtk/quicksearch.c:431
msgid "locked messages"
msgstr ""
-#: src/gtk/quicksearch.c:431
+#: src/gtk/quicksearch.c:432
msgid "messages which are in newsgroup S"
msgstr ""
-#: src/gtk/quicksearch.c:432
+#: src/gtk/quicksearch.c:433
msgid "new messages"
msgstr ""
-#: src/gtk/quicksearch.c:433
+#: src/gtk/quicksearch.c:434
msgid "old messages"
msgstr ""
-#: src/gtk/quicksearch.c:434
+#: src/gtk/quicksearch.c:435
msgid "incomplete messages (not entirely downloaded)"
msgstr ""
-#: src/gtk/quicksearch.c:435
+#: src/gtk/quicksearch.c:436
msgid "messages which have been replied to"
msgstr ""
-#: src/gtk/quicksearch.c:436
+#: src/gtk/quicksearch.c:437
msgid "read messages"
msgstr ""
-#: src/gtk/quicksearch.c:437
+#: src/gtk/quicksearch.c:438
msgid "messages which contain S in subject"
msgstr ""
-#: src/gtk/quicksearch.c:438
+#: src/gtk/quicksearch.c:439
msgid "messages whose score is equal to #"
msgstr ""
-#: src/gtk/quicksearch.c:439
+#: src/gtk/quicksearch.c:440
msgid "messages whose score is greater than #"
msgstr ""
-#: src/gtk/quicksearch.c:440
+#: src/gtk/quicksearch.c:441
msgid "messages whose score is lower than #"
msgstr ""
-#: src/gtk/quicksearch.c:441
+#: src/gtk/quicksearch.c:442
msgid "messages whose size is equal to #"
msgstr ""
-#: src/gtk/quicksearch.c:442
+#: src/gtk/quicksearch.c:443
msgid "messages whose size is greater than #"
msgstr ""
-#: src/gtk/quicksearch.c:443
+#: src/gtk/quicksearch.c:444
msgid "messages whose size is smaller than #"
msgstr ""
-#: src/gtk/quicksearch.c:444
+#: src/gtk/quicksearch.c:445
msgid "messages which have been sent to S"
msgstr ""
-#: src/gtk/quicksearch.c:445
+#: src/gtk/quicksearch.c:446
msgid "messages which tags contain S"
msgstr ""
-#: src/gtk/quicksearch.c:446
+#: src/gtk/quicksearch.c:447
msgid "messages which have tag(s)"
msgstr ""
-#: src/gtk/quicksearch.c:447
+#: src/gtk/quicksearch.c:448
msgid "marked messages"
msgstr ""
-#: src/gtk/quicksearch.c:448
+#: src/gtk/quicksearch.c:449
msgid "unread messages"
msgstr ""
-#: src/gtk/quicksearch.c:449
+#: src/gtk/quicksearch.c:450
msgid "messages which contain S in References header"
msgstr ""
-#: src/gtk/quicksearch.c:450
+#: src/gtk/quicksearch.c:451
#, c-format
msgid "messages returning 0 when passed to command - %F is message file"
msgstr ""
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
msgid "messages which contain S in X-Label header"
msgstr ""
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:454
msgid "logical AND operator"
msgstr ""
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:455
msgid "logical OR operator"
msgstr ""
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:456
msgid "logical NOT operator"
msgstr ""
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:457
msgid "case sensitive search"
msgstr ""
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:459
msgid "all filtering expressions are allowed"
msgstr ""
-#: src/gtk/quicksearch.c:466 src/summary_search.c:401
+#: src/gtk/quicksearch.c:467 src/summary_search.c:397
msgid "Extended Search"
msgstr ""
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:468
msgid ""
"Extended Search allows the user to define criteria that messages must have "
"in order to match and be displayed in the message list.\n"
"The following symbols can be used:"
msgstr ""
-#: src/gtk/quicksearch.c:586
+#: src/gtk/quicksearch.c:587
msgid "From/To/Subject/Tag"
msgstr ""
-#: src/gtk/quicksearch.c:597
+#: src/gtk/quicksearch.c:598
msgid "Recursive"
msgstr ""
-#: src/gtk/quicksearch.c:607
+#: src/gtk/quicksearch.c:608
msgid "Sticky"
msgstr ""
-#: src/gtk/quicksearch.c:617
+#: src/gtk/quicksearch.c:618
msgid "Type-ahead"
msgstr ""
-#: src/gtk/quicksearch.c:629
+#: src/gtk/quicksearch.c:630
msgid "Run on select"
msgstr ""
-#: src/gtk/quicksearch.c:666 src/gtk/quicksearch.c:758
+#: src/gtk/quicksearch.c:667 src/gtk/quicksearch.c:756
msgid " Clear "
msgstr ""
@@ -4820,354 +4642,396 @@ msgstr ""
msgid "Clear the current search"
msgstr ""
-#: src/gtk/quicksearch.c:689 src/summary_search.c:354
+#: src/gtk/quicksearch.c:688 src/summary_search.c:350
msgid "Edit search criteria"
msgstr ""
-#: src/gtk/quicksearch.c:695 src/gtk/quicksearch.c:756
+#: src/gtk/quicksearch.c:694 src/gtk/quicksearch.c:754
msgid " Extended Symbols... "
msgstr ""
-#: src/gtk/quicksearch.c:703
+#: src/gtk/quicksearch.c:701
msgid "Information about extended symbols"
msgstr ""
-#: src/gtk/quicksearch.c:774
+#: src/gtk/quicksearch.c:772
msgid "Info"
msgstr ""
-#: src/gtk/quicksearch.c:776
+#: src/gtk/quicksearch.c:774
msgid "Clear"
msgstr ""
-#: src/gtk/quicksearch.c:1259 src/summaryview.c:1288
+#: src/gtk/quicksearch.c:1257 src/summaryview.c:1451
#, c-format
msgid "Searching in %s... \n"
msgstr ""
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:96
-#: src/gtk/sslcertwindow.c:102 src/gtk/sslcertwindow.c:109
-#: src/gtk/sslcertwindow.c:120 src/gtk/sslcertwindow.c:126
-#: src/gtk/sslcertwindow.c:144 src/gtk/sslcertwindow.c:151
-#: src/gtk/sslcertwindow.c:166 src/gtk/sslcertwindow.c:171
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:193
+#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:97
+#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:110
+#: src/gtk/sslcertwindow.c:121 src/gtk/sslcertwindow.c:127
+#: src/gtk/sslcertwindow.c:145 src/gtk/sslcertwindow.c:152
+#: src/gtk/sslcertwindow.c:167 src/gtk/sslcertwindow.c:172
+#: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:194
msgid "<not in certificate>"
msgstr ""
-#: src/gtk/sslcertwindow.c:219 src/gtk/sslcertwindow.c:375
-#: src/gtk/sslcertwindow.c:419 src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:225 src/gtk/sslcertwindow.c:394
+#: src/gtk/sslcertwindow.c:439 src/gtk/sslcertwindow.c:498
msgid "correct"
msgstr ""
-#: src/gtk/sslcertwindow.c:224
+#: src/gtk/sslcertwindow.c:230
msgid "Owner"
msgstr ""
-#: src/gtk/sslcertwindow.c:225
+#: src/gtk/sslcertwindow.c:231
msgid "Signer"
msgstr ""
-#: src/gtk/sslcertwindow.c:232 src/gtk/sslcertwindow.c:253
-#: src/prefs_themes.c:879
+#: src/gtk/sslcertwindow.c:238 src/gtk/sslcertwindow.c:262
+#: src/prefs_themes.c:892
msgid "Name: "
msgstr ""
-#: src/gtk/sslcertwindow.c:239 src/gtk/sslcertwindow.c:260
+#: src/gtk/sslcertwindow.c:246 src/gtk/sslcertwindow.c:270
msgid "Organization: "
msgstr "Organisation: "
-#: src/gtk/sslcertwindow.c:246 src/gtk/sslcertwindow.c:267
+#: src/gtk/sslcertwindow.c:254 src/gtk/sslcertwindow.c:278
msgid "Location: "
msgstr ""
-#: src/gtk/sslcertwindow.c:274
-msgid "Fingerprint: "
+#: src/gtk/sslcertwindow.c:286
+msgid "Fingerprint: \n"
msgstr ""
-#: src/gtk/sslcertwindow.c:280
+#: src/gtk/sslcertwindow.c:296
msgid "Signature status: "
msgstr ""
-#: src/gtk/sslcertwindow.c:286
+#: src/gtk/sslcertwindow.c:303
msgid "Expires on: "
msgstr ""
-#: src/gtk/sslcertwindow.c:347
+#: src/gtk/sslcertwindow.c:366
#, c-format
msgid "SSL certificate for %s"
msgstr ""
-#: src/gtk/sslcertwindow.c:363
+#: src/gtk/sslcertwindow.c:382
#, c-format
msgid ""
"Certificate for %s is unknown.\n"
"Do you want to accept it?"
msgstr ""
-#: src/gtk/sslcertwindow.c:377 src/gtk/sslcertwindow.c:421
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:396 src/gtk/sslcertwindow.c:441
+#: src/gtk/sslcertwindow.c:500
#, c-format
msgid "Signature status: %s"
msgstr ""
-#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:428
+#: src/gtk/sslcertwindow.c:404 src/gtk/sslcertwindow.c:449
msgid "_View certificate"
msgstr ""
-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:409
msgid "Unknown SSL Certificate"
msgstr ""
-#: src/gtk/sslcertwindow.c:390 src/gtk/sslcertwindow.c:434
-#: src/gtk/sslcertwindow.c:491
+#: src/gtk/sslcertwindow.c:410 src/gtk/sslcertwindow.c:455
+#: src/gtk/sslcertwindow.c:513
msgid "_Cancel connection"
msgstr ""
-#: src/gtk/sslcertwindow.c:390 src/gtk/sslcertwindow.c:491
+#: src/gtk/sslcertwindow.c:410 src/gtk/sslcertwindow.c:513
msgid "_Accept and save"
msgstr ""
-#: src/gtk/sslcertwindow.c:406
+#: src/gtk/sslcertwindow.c:426
#, c-format
msgid ""
"Certificate for %s is expired.\n"
"Do you want to continue?"
msgstr ""
-#: src/gtk/sslcertwindow.c:433
+#: src/gtk/sslcertwindow.c:454
msgid "Expired SSL Certificate"
msgstr ""
-#: src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:455
msgid "_Accept"
msgstr ""
-#: src/gtk/sslcertwindow.c:452
+#: src/gtk/sslcertwindow.c:473
msgid "New certificate:"
msgstr ""
-#: src/gtk/sslcertwindow.c:457
+#: src/gtk/sslcertwindow.c:478
msgid "Known certificate:"
msgstr ""
-#: src/gtk/sslcertwindow.c:464
+#: src/gtk/sslcertwindow.c:485
#, c-format
msgid "Certificate for %s has changed. Do you want to accept it?"
msgstr ""
-#: src/gtk/sslcertwindow.c:486
+#: src/gtk/sslcertwindow.c:508
msgid "_View certificates"
msgstr ""
-#: src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:512
msgid "Changed SSL Certificate"
msgstr ""
-#: src/headerview.c:112
+#: src/headerview.c:106
msgid "Tags:"
msgstr ""
-#: src/headerview.c:221 src/summaryview.c:3115 src/summaryview.c:3125
+#: src/headerview.c:215 src/summaryview.c:3336 src/summaryview.c:3346
msgid "(No From)"
msgstr ""
-#: src/headerview.c:236 src/summaryview.c:3148 src/summaryview.c:3151
+#: src/headerview.c:230 src/summaryview.c:3369 src/summaryview.c:3372
msgid "(No Subject)"
msgstr ""
-#: src/image_viewer.c:97
+#: src/image_viewer.c:99
msgid "Error:"
msgstr ""
-#: src/image_viewer.c:301
+#: src/image_viewer.c:298
msgid "Filename:"
msgstr ""
-#: src/image_viewer.c:308
+#: src/image_viewer.c:305
msgid "Filesize:"
msgstr ""
-#: src/image_viewer.c:357
+#: src/image_viewer.c:354
msgid "Load Image"
msgstr ""
-#: src/imap.c:554
+#: src/imap.c:540
msgid "IMAP4 connection broken\n"
msgstr ""
-#: src/imap.c:578
-msgid "IMAP error: authenticated\n"
+#: src/imap.c:565
+#, c-format
+msgid "IMAP error on %s: authenticated\n"
msgstr ""
-#: src/imap.c:581
-msgid "IMAP error: not authenticated\n"
+#: src/imap.c:568
+#, c-format
+msgid "IMAP error on %s: not authenticated\n"
msgstr ""
-#: src/imap.c:584
-msgid "IMAP error: bad state\n"
+#: src/imap.c:571
+#, c-format
+msgid "IMAP error on %s: bad state\n"
msgstr ""
-#: src/imap.c:587
-msgid "IMAP error: stream error\n"
+#: src/imap.c:574
+#, c-format
+msgid "IMAP error on %s: stream error\n"
msgstr ""
-#: src/imap.c:590
+#: src/imap.c:577
+#, c-format
msgid ""
-"IMAP error: parse error (very probably non-RFC compliance from the server)\n"
+"IMAP error on %s: parse error (very probably non-RFC compliance from the "
+"server)\n"
msgstr ""
-#: src/imap.c:594
-msgid "IMAP error: connection refused\n"
+#: src/imap.c:581
+#, c-format
+msgid "IMAP error on %s: connection refused\n"
msgstr ""
-#: src/imap.c:597
-msgid "IMAP error: memory error\n"
+#: src/imap.c:584
+#, c-format
+msgid "IMAP error on %s: memory error\n"
msgstr ""
-#: src/imap.c:600
-msgid "IMAP error: fatal error\n"
+#: src/imap.c:587
+#, c-format
+msgid "IMAP error on %s: fatal error\n"
msgstr ""
-#: src/imap.c:603
+#: src/imap.c:590
+#, c-format
msgid ""
-"IMAP error: protocol error(very probably non-RFC compliance from the "
+"IMAP error on %s: protocol error(very probably non-RFC compliance from the "
"server)\n"
msgstr ""
-#: src/imap.c:607
-msgid "IMAP error: connection not accepted\n"
+#: src/imap.c:594
+#, c-format
+msgid "IMAP error on %s: connection not accepted\n"
msgstr ""
-#: src/imap.c:610
-msgid "IMAP error: APPEND error\n"
+#: src/imap.c:597
+#, c-format
+msgid "IMAP error on %s: APPEND error\n"
msgstr ""
-#: src/imap.c:613
-msgid "IMAP error: NOOP error\n"
+#: src/imap.c:600
+#, c-format
+msgid "IMAP error on %s: NOOP error\n"
msgstr ""
-#: src/imap.c:616
-msgid "IMAP error: LOGOUT error\n"
+#: src/imap.c:603
+#, c-format
+msgid "IMAP error on %s: LOGOUT error\n"
msgstr ""
-#: src/imap.c:619
-msgid "IMAP error: CAPABILITY error\n"
+#: src/imap.c:606
+#, c-format
+msgid "IMAP error on %s: CAPABILITY error\n"
msgstr ""
-#: src/imap.c:622
-msgid "IMAP error: CHECK error\n"
+#: src/imap.c:609
+#, c-format
+msgid "IMAP error on %s: CHECK error\n"
msgstr ""
-#: src/imap.c:625
-msgid "IMAP error: CLOSE error\n"
+#: src/imap.c:612
+#, c-format
+msgid "IMAP error on %s: CLOSE error\n"
msgstr ""
-#: src/imap.c:628
-msgid "IMAP error: EXPUNGE error\n"
+#: src/imap.c:615
+#, c-format
+msgid "IMAP error on %s: EXPUNGE error\n"
msgstr ""
-#: src/imap.c:631
-msgid "IMAP error: COPY error\n"
+#: src/imap.c:618
+#, c-format
+msgid "IMAP error on %s: COPY error\n"
msgstr ""
-#: src/imap.c:634
-msgid "IMAP error: UID COPY error\n"
+#: src/imap.c:621
+#, c-format
+msgid "IMAP error on %s: UID COPY error\n"
msgstr ""
-#: src/imap.c:637
-msgid "IMAP error: CREATE error\n"
+#: src/imap.c:624
+#, c-format
+msgid "IMAP error on %s: CREATE error\n"
msgstr ""
-#: src/imap.c:640
-msgid "IMAP error: DELETE error\n"
+#: src/imap.c:627
+#, c-format
+msgid "IMAP error on %s: DELETE error\n"
msgstr ""
-#: src/imap.c:643
-msgid "IMAP error: EXAMINE error\n"
+#: src/imap.c:630
+#, c-format
+msgid "IMAP error on %s: EXAMINE error\n"
msgstr ""
-#: src/imap.c:646
-msgid "IMAP error: FETCH error\n"
+#: src/imap.c:633
+#, c-format
+msgid "IMAP error on %s: FETCH error\n"
msgstr ""
-#: src/imap.c:649
-msgid "IMAP error: UID FETCH error\n"
+#: src/imap.c:636
+#, c-format
+msgid "IMAP error on %s: UID FETCH error\n"
msgstr ""
-#: src/imap.c:652
-msgid "IMAP error: LIST error\n"
+#: src/imap.c:639
+#, c-format
+msgid "IMAP error on %s: LIST error\n"
msgstr ""
-#: src/imap.c:655
-msgid "IMAP error: LOGIN error\n"
+#: src/imap.c:642
+#, c-format
+msgid "IMAP error on %s: LOGIN error\n"
msgstr ""
-#: src/imap.c:658
-msgid "IMAP error: LSUB error\n"
+#: src/imap.c:645
+#, c-format
+msgid "IMAP error on %s: LSUB error\n"
msgstr ""
-#: src/imap.c:661
-msgid "IMAP error: RENAME error\n"
+#: src/imap.c:648
+#, c-format
+msgid "IMAP error on %s: RENAME error\n"
msgstr ""
-#: src/imap.c:664
-msgid "IMAP error: SEARCH error\n"
+#: src/imap.c:651
+#, c-format
+msgid "IMAP error on %s: SEARCH error\n"
msgstr ""
-#: src/imap.c:667
-msgid "IMAP error: UID SEARCH error\n"
+#: src/imap.c:654
+#, c-format
+msgid "IMAP error on %s: UID SEARCH error\n"
msgstr ""
-#: src/imap.c:670
-msgid "IMAP error: SELECT error\n"
+#: src/imap.c:657
+#, c-format
+msgid "IMAP error on %s: SELECT error\n"
msgstr ""
-#: src/imap.c:673
-msgid "IMAP error: STATUS error\n"
+#: src/imap.c:660
+#, c-format
+msgid "IMAP error on %s: STATUS error\n"
msgstr ""
-#: src/imap.c:676
-msgid "IMAP error: STORE error\n"
+#: src/imap.c:663
+#, c-format
+msgid "IMAP error on %s: STORE error\n"
msgstr ""
-#: src/imap.c:679
-msgid "IMAP error: UID STORE error\n"
+#: src/imap.c:666
+#, c-format
+msgid "IMAP error on %s: UID STORE error\n"
msgstr ""
-#: src/imap.c:682
-msgid "IMAP error: SUBSCRIBE error\n"
+#: src/imap.c:669
+#, c-format
+msgid "IMAP error on %s: SUBSCRIBE error\n"
msgstr ""
-#: src/imap.c:685
-msgid "IMAP error: UNSUBSCRIBE error\n"
+#: src/imap.c:672
+#, c-format
+msgid "IMAP error on %s: UNSUBSCRIBE error\n"
msgstr ""
-#: src/imap.c:688
-msgid "IMAP error: STARTTLS error\n"
+#: src/imap.c:675
+#, c-format
+msgid "IMAP error on %s: STARTTLS error\n"
msgstr ""
-#: src/imap.c:691
-msgid "IMAP error: INVAL error\n"
+#: src/imap.c:678
+#, c-format
+msgid "IMAP error on %s: INVAL error\n"
msgstr ""
-#: src/imap.c:694
-msgid "IMAP error: EXTENSION error\n"
+#: src/imap.c:681
+#, c-format
+msgid "IMAP error on %s: EXTENSION error\n"
msgstr ""
-#: src/imap.c:697
-msgid "IMAP error: SASL error\n"
+#: src/imap.c:684
+#, c-format
+msgid "IMAP error on %s: SASL error\n"
msgstr ""
-#: src/imap.c:702
-msgid "IMAP error: SSL error\n"
+#: src/imap.c:688
+#, c-format
+msgid "IMAP error on %s: SSL error\n"
msgstr ""
-#: src/imap.c:707
+#: src/imap.c:692
#, c-format
-msgid "IMAP error: Unknown error [%d]\n"
+msgid "IMAP error on %s: Unknown error [%d]\n"
msgstr ""
-#: src/imap.c:890
+#: src/imap.c:873
msgid ""
"\n"
"\n"
@@ -5175,7 +5039,7 @@ msgid ""
"and the CRAM-MD5 SASL plugin is installed."
msgstr ""
-#: src/imap.c:896
+#: src/imap.c:879
msgid ""
"\n"
"\n"
@@ -5183,36 +5047,36 @@ msgid ""
"and the DIGEST-MD5 SASL plugin is installed."
msgstr ""
-#: src/imap.c:903
+#: src/imap.c:886
#, c-format
msgid "Connection to %s failed: login refused.%s"
msgstr ""
-#: src/imap.c:907
+#: src/imap.c:890
#, c-format
msgid "Connection to %s failed: login refused.%s\n"
msgstr ""
-#: src/imap.c:924
+#: src/imap.c:908
#, c-format
msgid "Connecting to %s failed"
msgstr ""
-#: src/imap.c:930 src/imap.c:933
+#: src/imap.c:915 src/imap.c:918
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
msgstr ""
-#: src/imap.c:962 src/imap.c:2994 src/imap.c:3633 src/imap.c:3723
-#: src/imap.c:3900 src/imap.c:4673
+#: src/imap.c:948 src/imap.c:3044 src/imap.c:3690 src/imap.c:3784
+#: src/imap.c:3961 src/imap.c:4772
msgid "Claws Mail needs network access in order to access the IMAP server."
msgstr ""
-#: src/imap.c:1044 src/inc.c:803 src/news.c:349 src/send_message.c:299
+#: src/imap.c:1041 src/inc.c:795 src/news.c:353 src/send_message.c:289
msgid "Insecure connection"
msgstr ""
-#: src/imap.c:1045 src/inc.c:804 src/news.c:350 src/send_message.c:300
+#: src/imap.c:1042 src/inc.c:796 src/news.c:354 src/send_message.c:290
msgid ""
"This connection is configured to be secured using SSL, but SSL is not "
"available in this build of Claws Mail. \n"
@@ -5221,128 +5085,133 @@ msgid ""
"not be secure."
msgstr ""
-#: src/imap.c:1051 src/inc.c:810 src/news.c:356 src/send_message.c:306
+#: src/imap.c:1048 src/inc.c:802 src/news.c:360 src/send_message.c:296
msgid "Con_tinue connecting"
msgstr ""
-#: src/imap.c:1061
+#: src/imap.c:1058
#, c-format
msgid "Connecting to IMAP4 server: %s..."
msgstr ""
-#: src/imap.c:1105
+#: src/imap.c:1100
#, c-format
msgid "Can't connect to IMAP4 server: %s:%d"
msgstr ""
-#: src/imap.c:1108
+#: src/imap.c:1103
#, c-format
msgid "Can't connect to IMAP4 server: %s:%d\n"
msgstr ""
-#: src/imap.c:1140 src/imap.c:3392
+#: src/imap.c:1136 src/imap.c:3450
msgid "Can't start TLS session.\n"
msgstr ""
-#: src/imap.c:1177
+#: src/imap.c:1178
#, c-format
msgid "Connecting to IMAP4 server %s...\n"
msgstr ""
-#: src/imap.c:1188 src/imap.c:1191
+#: src/imap.c:1193
+#, c-format
+msgid "Couldn't login to IMAP server %s.\n"
+msgstr ""
+
+#: src/imap.c:1196
#, c-format
msgid "Couldn't login to IMAP server %s."
msgstr ""
-#: src/imap.c:1585
+#: src/imap.c:1592
msgid "Adding messages..."
msgstr ""
-#: src/imap.c:1778 src/mh.c:517
+#: src/imap.c:1793 src/mh.c:517
msgid "Copying messages..."
msgstr ""
-#: src/imap.c:1968
+#: src/imap.c:1985
msgid "can't set deleted flags\n"
msgstr ""
-#: src/imap.c:1974 src/imap.c:4329
+#: src/imap.c:1991 src/imap.c:4398
msgid "can't expunge\n"
msgstr ""
-#: src/imap.c:2307
+#: src/imap.c:2337
#, c-format
msgid "Looking for unsubscribed folders in %s..."
msgstr ""
-#: src/imap.c:2310
+#: src/imap.c:2340
#, c-format
msgid "Looking for subfolders of %s..."
msgstr ""
-#: src/imap.c:2546
+#: src/imap.c:2589
msgid "can't create mailbox: LIST failed\n"
msgstr ""
-#: src/imap.c:2561
+#: src/imap.c:2604
msgid "can't create mailbox\n"
msgstr ""
-#: src/imap.c:2651
+#: src/imap.c:2695
msgid "New folder name must not contain the namespace path separator"
msgstr ""
-#: src/imap.c:2683
+#: src/imap.c:2732
#, c-format
msgid "can't rename mailbox: %s to %s\n"
msgstr ""
-#: src/imap.c:2784
+#: src/imap.c:2835
msgid "can't delete mailbox\n"
msgstr ""
-#: src/imap.c:3075
+#: src/imap.c:3125
msgid "LIST failed\n"
msgstr ""
-#: src/imap.c:3154
+#: src/imap.c:3207
msgid "Flagging messages..."
msgstr ""
-#: src/imap.c:3244
+#: src/imap.c:3301
#, c-format
msgid "can't select folder: %s\n"
msgstr ""
-#: src/imap.c:3389
+#: src/imap.c:3447
msgid "Server requires TLS to log in.\n"
msgstr ""
-#: src/imap.c:3399
+#: src/imap.c:3457
msgid "Can't refresh capabilities.\n"
msgstr ""
-#: src/imap.c:3404
+#: src/imap.c:3462
#, c-format
msgid ""
"Connection to %s failed: server requires TLS, but Claws Mail has been "
"compiled without OpenSSL support.\n"
msgstr ""
-#: src/imap.c:3412
+#: src/imap.c:3470
msgid "Server logins are disabled.\n"
msgstr ""
-#: src/imap.c:3638
+#: src/imap.c:3695
msgid "Fetching message..."
msgstr ""
-#: src/imap.c:4315
+#: src/imap.c:4384
#, c-format
msgid "can't set deleted flags: %d\n"
msgstr ""
-#: src/imap.c:5320
+#: src/imap.c:5428
msgid ""
"You have one or more IMAP accounts defined. However this version of Claws "
"Mail has been built without IMAP support; your IMAP account(s) are "
@@ -5351,94 +5220,94 @@ msgid ""
"You probably need to install libetpan and recompile Claws Mail."
msgstr ""
-#: src/imap_gtk.c:58 src/mh_gtk.c:50
-msgid "/Create _new folder..."
-msgstr ""
-
#: src/imap_gtk.c:60 src/mh_gtk.c:52
-msgid "/_Rename folder..."
+msgid "Create _new folder..."
msgstr ""
-#: src/imap_gtk.c:61 src/mh_gtk.c:53
-msgid "/M_ove folder..."
+#: src/imap_gtk.c:62 src/mh_gtk.c:53 src/news_gtk.c:60
+msgid "_Rename folder..."
msgstr ""
-#: src/imap_gtk.c:62 src/mh_gtk.c:54
-msgid "/Cop_y folder..."
+#: src/imap_gtk.c:63 src/mh_gtk.c:54
+msgid "M_ove folder..."
msgstr ""
-#: src/imap_gtk.c:64 src/mh_gtk.c:56
-msgid "/_Delete folder..."
+#: src/imap_gtk.c:64 src/mh_gtk.c:55
+msgid "Cop_y folder..."
msgstr ""
-#: src/imap_gtk.c:66
-msgid "/_Synchronise"
+#: src/imap_gtk.c:66 src/mh_gtk.c:56
+msgid "_Delete folder..."
msgstr ""
-#: src/imap_gtk.c:67 src/news_gtk.c:57
-msgid "/Down_load messages"
+#: src/imap_gtk.c:68 src/news_gtk.c:58
+msgid "Synchronise"
msgstr ""
-#: src/imap_gtk.c:69
-msgid "/S_ubscriptions"
+#: src/imap_gtk.c:69 src/news_gtk.c:59
+msgid "Down_load messages"
msgstr ""
-#: src/imap_gtk.c:70
-msgid "/Subscriptions/Show only subscribed _folders"
+#: src/imap_gtk.c:72
+msgid "S_ubscriptions"
msgstr ""
-#: src/imap_gtk.c:72
-msgid "/Subscriptions/---"
+#: src/imap_gtk.c:74
+msgid "_Subscribe..."
msgstr ""
-#: src/imap_gtk.c:73
-msgid "/Subscriptions/_Subscribe..."
+#: src/imap_gtk.c:75
+msgid "_Unsubscribe..."
msgstr ""
-#: src/imap_gtk.c:74
-msgid "/Subscriptions/_Unsubscribe..."
+#: src/imap_gtk.c:77 src/mh_gtk.c:57 src/news_gtk.c:62
+msgid "_Check for new messages"
msgstr ""
-#: src/imap_gtk.c:77 src/mh_gtk.c:58 src/news_gtk.c:59
-msgid "/_Check for new messages"
+#: src/imap_gtk.c:78 src/mh_gtk.c:58
+msgid "C_heck for new folders"
msgstr ""
-#: src/imap_gtk.c:78 src/mh_gtk.c:59
-msgid "/C_heck for new folders"
+#: src/imap_gtk.c:79 src/mh_gtk.c:59
+msgid "R_ebuild folder tree"
msgstr ""
-#: src/imap_gtk.c:79 src/mh_gtk.c:60
-msgid "/R_ebuild folder tree"
+#: src/imap_gtk.c:84
+msgid "Show only subscribed _folders"
msgstr ""
-#: src/imap_gtk.c:156
+#: src/imap_gtk.c:193
msgid ""
"Input the name of new folder:\n"
"(if you want to create a folder to store subfolders\n"
"only and no mail, append '/' to the folder name)"
msgstr ""
-#: src/imap_gtk.c:214 src/mh_gtk.c:231
+#: src/imap_gtk.c:197 src/mh_gtk.c:145
+msgid "Inherit properties from parent folder"
+msgstr ""
+
+#: src/imap_gtk.c:259 src/mh_gtk.c:249 src/news_gtk.c:305
#, c-format
msgid "Input new name for '%s':"
msgstr ""
-#: src/imap_gtk.c:216 src/mh_gtk.c:233
+#: src/imap_gtk.c:261 src/mh_gtk.c:251
msgid "Rename folder"
msgstr ""
-#: src/imap_gtk.c:230
+#: src/imap_gtk.c:275
#, c-format
msgid "`%c' can't be included in folder name."
msgstr ""
-#: src/imap_gtk.c:247 src/mh_gtk.c:258
+#: src/imap_gtk.c:292 src/mh_gtk.c:276 src/news_gtk.c:327
msgid ""
"The folder could not be renamed.\n"
"The new folder name is not allowed."
msgstr ""
-#: src/imap_gtk.c:299 src/mh_gtk.c:179
+#: src/imap_gtk.c:361 src/mh_gtk.c:197
#, c-format
msgid ""
"All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -5447,42 +5316,42 @@ msgid ""
"Do you really want to delete?"
msgstr ""
-#: src/imap_gtk.c:321 src/mh_gtk.c:201 src/news_gtk.c:242
+#: src/imap_gtk.c:383 src/mh_gtk.c:219 src/news_gtk.c:265
#, c-format
msgid "Can't remove the folder '%s'."
msgstr ""
-#: src/imap_gtk.c:448
+#: src/imap_gtk.c:509
#, c-format
msgid "Do you want to search for unsubscribed subfolders of '%s'?"
msgstr ""
-#: src/imap_gtk.c:451
+#: src/imap_gtk.c:512
msgid "Search recursively"
msgstr ""
-#: src/imap_gtk.c:456 src/imap_gtk.c:513
+#: src/imap_gtk.c:517 src/imap_gtk.c:574
msgid "Subscriptions"
msgstr ""
-#: src/imap_gtk.c:457
+#: src/imap_gtk.c:518
msgid "+_Search"
msgstr ""
-#: src/imap_gtk.c:467
+#: src/imap_gtk.c:528
#, c-format
msgid "Choose a subfolder of %s to subscribe to: "
msgstr ""
-#: src/imap_gtk.c:476
+#: src/imap_gtk.c:537 src/mainwindow.c:605
msgid "Subscribe"
msgstr ""
-#: src/imap_gtk.c:478 src/imap_gtk.c:480
+#: src/imap_gtk.c:539 src/imap_gtk.c:541
msgid "All of them"
msgstr ""
-#: src/imap_gtk.c:496
+#: src/imap_gtk.c:557
msgid ""
"This folder is already subscribed and has no unsubscribed subfolders.\n"
"\n"
@@ -5490,133 +5359,133 @@ msgid ""
"\"Check for new folders\" at the mailbox's root folder."
msgstr ""
-#: src/imap_gtk.c:505
+#: src/imap_gtk.c:566
#, c-format
msgid "Do you want to %s the '%s' folder?"
msgstr ""
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:567
msgid "subscribe"
msgstr ""
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:567
msgid "unsubscribe"
msgstr ""
-#: src/imap_gtk.c:508 src/prefs_folder_item.c:1185
-#: src/prefs_folder_item.c:1203 src/prefs_folder_item.c:1221
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1216
+#: src/prefs_folder_item.c:1237 src/prefs_folder_item.c:1258
msgid "Apply to subfolders"
msgstr ""
-#: src/imap_gtk.c:514
+#: src/imap_gtk.c:575
msgid "+_Subscribe"
msgstr ""
-#: src/imap_gtk.c:514
+#: src/imap_gtk.c:575
msgid "+_Unsubscribe"
msgstr ""
-#: src/import.c:120 src/import.c:215
+#: src/import.c:110 src/import.c:205
msgid "Import mbox file"
msgstr ""
-#: src/import.c:139
+#: src/import.c:129
msgid "Locate the mbox file and specify the destination folder."
msgstr ""
-#: src/import.c:156
+#: src/import.c:146
msgid "Destination folder:"
msgstr ""
-#: src/import.c:210
+#: src/import.c:200
msgid "Source mbox filename can't be left empty."
msgstr ""
-#: src/import.c:215
+#: src/import.c:205
msgid ""
"Destination folder is not set.\n"
"Import mbox file to the Inbox folder?"
msgstr ""
-#: src/import.c:237
+#: src/import.c:227
msgid "Can't find the destination folder."
msgstr ""
-#: src/import.c:261
+#: src/import.c:251
msgid "Select importing file"
msgstr ""
-#: src/importldif.c:191
+#: src/importldif.c:186
msgid "Please specify address book name and file to import."
msgstr ""
-#: src/importldif.c:194
+#: src/importldif.c:189
msgid "Select and rename LDIF field names to import."
msgstr ""
-#: src/importldif.c:197
+#: src/importldif.c:192
msgid "File imported."
msgstr ""
-#: src/importldif.c:452 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:447 src/importmutt.c:122 src/importpine.c:121
msgid "Please select a file."
msgstr ""
-#: src/importldif.c:458 src/importmutt.c:132 src/importpine.c:131
+#: src/importldif.c:453 src/importmutt.c:127 src/importpine.c:126
msgid "Address book name must be supplied."
msgstr ""
-#: src/importldif.c:498
+#: src/importldif.c:493
msgid "LDIF file imported successfully."
msgstr ""
-#: src/importldif.c:583
+#: src/importldif.c:578
msgid "Select LDIF File"
msgstr ""
-#: src/importldif.c:671
+#: src/importldif.c:665
msgid ""
"Specify the name for the address book that will be created from the LDIF "
"file data."
msgstr ""
-#: src/importldif.c:677
+#: src/importldif.c:670
msgid "File Name"
msgstr ""
-#: src/importldif.c:688
+#: src/importldif.c:680
msgid "The full file specification of the LDIF file to import."
msgstr ""
-#: src/importldif.c:697
+#: src/importldif.c:687
msgid "Select the LDIF file to import."
msgstr ""
-#: src/importldif.c:735
+#: src/importldif.c:724
msgid "R"
msgstr ""
-#: src/importldif.c:736 src/summaryview.c:544
+#: src/importldif.c:725 src/summaryview.c:595
msgid "S"
msgstr ""
-#: src/importldif.c:737
+#: src/importldif.c:726
msgid "LDIF Field Name"
msgstr ""
-#: src/importldif.c:738
+#: src/importldif.c:727
msgid "Attribute Name"
msgstr ""
-#: src/importldif.c:793
+#: src/importldif.c:782
msgid "LDIF Field"
msgstr ""
-#: src/importldif.c:805
+#: src/importldif.c:794
msgid "Attribute"
msgstr ""
-#: src/importldif.c:818
+#: src/importldif.c:806
msgid ""
"Choose the LDIF field that will be renamed or selected for import in the "
"list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -5627,273 +5496,275 @@ msgid ""
"field for import."
msgstr ""
-#: src/importldif.c:835
+#: src/importldif.c:821
msgid "The LDIF field can be renamed to the User Attribute name."
msgstr ""
-#: src/importldif.c:841
+#: src/importldif.c:826
msgid "Select for Import"
msgstr ""
-#: src/importldif.c:847
+#: src/importldif.c:831
msgid "Select the LDIF field for import into the address book."
msgstr ""
-#: src/importldif.c:850
+#: src/importldif.c:833
msgid " Modify "
msgstr ""
-#: src/importldif.c:856
+#: src/importldif.c:838
msgid "This button will update the list above with the data supplied."
msgstr ""
-#: src/importldif.c:929
+#: src/importldif.c:910
msgid "Records Imported :"
msgstr ""
-#: src/importldif.c:961
+#: src/importldif.c:942
msgid "Import LDIF file into Address Book"
msgstr ""
-#: src/importldif.c:999
+#: src/importldif.c:980
msgid "Proceed"
msgstr ""
-#: src/importmutt.c:146
+#: src/importmutt.c:141
msgid "Error importing MUTT file."
msgstr ""
-#: src/importmutt.c:161
+#: src/importmutt.c:156
msgid "Select MUTT File"
msgstr ""
-#: src/importmutt.c:208
+#: src/importmutt.c:203
msgid "Import MUTT file into Address Book"
msgstr ""
-#: src/importmutt.c:293 src/importpine.c:293
+#: src/importmutt.c:288 src/importpine.c:288
msgid "Please select a file to import."
msgstr ""
-#: src/importpine.c:145
+#: src/importpine.c:140
msgid "Error importing Pine file."
msgstr ""
-#: src/importpine.c:160
+#: src/importpine.c:155
msgid "Select Pine File"
msgstr ""
-#: src/importpine.c:207
+#: src/importpine.c:202
msgid "Import Pine file into Address Book"
msgstr ""
-#: src/inc.c:195 src/inc.c:300 src/inc.c:326
+#: src/inc.c:192 src/inc.c:298 src/inc.c:324
msgid "Claws Mail needs network access in order to get mails."
msgstr ""
-#: src/inc.c:347
+#: src/inc.c:345
#, c-format
msgid "%s failed\n"
msgstr ""
-#: src/inc.c:417
+#: src/inc.c:415
msgid "Retrieving new messages"
msgstr ""
-#: src/inc.c:476
+#: src/inc.c:474
msgid "Standby"
msgstr ""
-#: src/inc.c:605 src/inc.c:655
+#: src/inc.c:599 src/inc.c:653
msgid "Cancelled"
msgstr ""
-#: src/inc.c:616
+#: src/inc.c:610
msgid "Retrieving"
msgstr ""
-#: src/inc.c:625
+#: src/inc.c:619
#, c-format
msgid "Done (%d message (%s) received)"
msgid_plural "Done (%d messages (%s) received)"
msgstr[0] ""
msgstr[1] ""
-#: src/inc.c:631
+#: src/inc.c:625
msgid "Done (no new messages)"
msgstr ""
-#: src/inc.c:636
+#: src/inc.c:630
msgid "Connection failed"
msgstr ""
-#: src/inc.c:639
+#: src/inc.c:633
msgid "Auth failed"
msgstr ""
-#: src/inc.c:642 src/prefs_matcher.c:370 src/prefs_summary_column.c:91
-#: src/summaryview.c:2610 src/summaryview.c:5788
+#: src/inc.c:640 src/prefs_matcher.c:372 src/prefs_summary_column.c:87
+#: src/summaryview.c:2814 src/summaryview.c:6059
msgid "Locked"
msgstr ""
-#: src/inc.c:652 src/plugins/spamassassin/spamassassin_gtk.c:381
+#: src/inc.c:650 src/plugins/spamassassin/spamassassin_gtk.c:376
msgid "Timeout"
msgstr ""
-#: src/inc.c:745
+#: src/inc.c:737
#, c-format
msgid "Finished (%d new message)"
msgid_plural "Finished (%d new messages)"
msgstr[0] ""
msgstr[1] ""
-#: src/inc.c:749
+#: src/inc.c:741
msgid "Finished (no new messages)"
msgstr ""
-#: src/inc.c:787
+#: src/inc.c:779
#, c-format
msgid "%s: Retrieving new messages"
msgstr ""
-#: src/inc.c:819
+#: src/inc.c:811
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr ""
-#: src/inc.c:836
+#: src/inc.c:828
#, c-format
msgid "Can't connect to POP3 server: %s:%d"
msgstr ""
-#: src/inc.c:840
+#: src/inc.c:832
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr ""
-#: src/inc.c:920 src/send_message.c:472
+#: src/inc.c:912 src/send_message.c:459
msgid "Authenticating..."
msgstr ""
-#: src/inc.c:922
+#: src/inc.c:914
#, c-format
msgid "Retrieving messages from %s (%s) ..."
msgstr ""
-#: src/inc.c:928
+#: src/inc.c:920
msgid "Getting the number of new messages (STAT)..."
msgstr ""
-#: src/inc.c:932
+#: src/inc.c:924
msgid "Getting the number of new messages (LAST)..."
msgstr ""
-#: src/inc.c:936
+#: src/inc.c:928
msgid "Getting the number of new messages (UIDL)..."
msgstr ""
-#: src/inc.c:940
+#: src/inc.c:932
msgid "Getting the size of messages (LIST)..."
msgstr ""
-#: src/inc.c:947 src/send_message.c:490
+#: src/inc.c:939 src/send_message.c:477
msgid "Quitting"
msgstr ""
-#: src/inc.c:972
+#: src/inc.c:964
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr ""
-#: src/inc.c:991
+#: src/inc.c:983
#, c-format
msgid "Retrieving (%d message (%s) received)"
msgid_plural "Retrieving (%d messages (%s) received)"
msgstr[0] ""
msgstr[1] ""
-#: src/inc.c:1147
+#: src/inc.c:1139
msgid "Connection failed."
msgstr ""
-#: src/inc.c:1151
+#: src/inc.c:1143
#, c-format
msgid "Connection to %s:%d failed."
msgstr ""
-#: src/inc.c:1156
+#: src/inc.c:1148
msgid "Error occurred while processing mail."
msgstr ""
-#: src/inc.c:1162
+#: src/inc.c:1154
#, c-format
msgid ""
"Error occurred while processing mail:\n"
"%s"
msgstr ""
-#: src/inc.c:1168
+#: src/inc.c:1160
msgid "No disk space left."
msgstr ""
-#: src/inc.c:1173
+#: src/inc.c:1165
msgid "Can't write file."
msgstr ""
-#: src/inc.c:1178
+#: src/inc.c:1170
msgid "Socket error."
msgstr ""
-#: src/inc.c:1181
+#: src/inc.c:1173
#, c-format
msgid "Socket error on connection to %s:%d."
msgstr ""
-#: src/inc.c:1186 src/send_message.c:400 src/send_message.c:648
+#: src/inc.c:1178 src/send_message.c:387 src/send_message.c:635
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1189
+#: src/inc.c:1181
#, c-format
msgid "Connection to %s:%d closed by the remote host."
msgstr ""
-#: src/inc.c:1194
+#: src/inc.c:1186
msgid "Mailbox is locked."
msgstr ""
-#: src/inc.c:1198
+#: src/inc.c:1190
#, c-format
msgid ""
"Mailbox is locked:\n"
"%s"
msgstr ""
-#: src/inc.c:1204 src/send_message.c:633
+#: src/inc.c:1196 src/send_message.c:620
msgid "Authentication failed."
msgstr ""
-#: src/inc.c:1210 src/send_message.c:636
+#: src/inc.c:1202 src/send_message.c:623
#, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr ""
-#: src/inc.c:1215 src/send_message.c:652
-msgid "Session timed out."
+#: src/inc.c:1207 src/send_message.c:639
+msgid ""
+"Session timed out. You may be able to recover by increasing the timeout "
+"value in Preferences/Other."
msgstr ""
-#: src/inc.c:1218
+#: src/inc.c:1212
#, c-format
msgid "Connection to %s:%d timed out."
msgstr ""
-#: src/inc.c:1256
+#: src/inc.c:1250
msgid "Incorporation cancelled\n"
msgstr ""
-#: src/inc.c:1442
+#: src/inc.c:1436
#, c-format
msgid "Claws Mail: %d new message"
msgid_plural "Claws Mail: %d new messages"
@@ -5918,29 +5789,29 @@ msgstr ""
msgid "On_ly once"
msgstr ""
-#: src/ldif.c:777
+#: src/ldif.c:780
msgid "Nick Name"
msgstr ""
-#: src/main.c:228
+#: src/main.c:244
#, c-format
msgid ""
"File '%s' already exists.\n"
"Can't create folder."
msgstr ""
-#: src/main.c:250 src/main.c:263
+#: src/main.c:266 src/main.c:279
msgid "Exiting..."
msgstr ""
-#: src/main.c:394
+#: src/main.c:410
#, c-format
msgid ""
"Configuration for %s found.\n"
"Do you want to migrate this configuration?"
msgstr ""
-#: src/main.c:396
+#: src/main.c:412
#, c-format
msgid ""
"\n"
@@ -5949,1316 +5820,1093 @@ msgid ""
"script available at %s."
msgstr ""
-#: src/main.c:409
+#: src/main.c:425
msgid "Keep old configuration"
msgstr ""
-#: src/main.c:412
+#: src/main.c:428
msgid ""
"Keeping a backup will allow you to go back to an older version, but may take "
"a while if you have cached IMAP or News data, and will take some extra room "
"on your disk."
msgstr ""
-#: src/main.c:421
+#: src/main.c:436
msgid "Migration of configuration"
msgstr ""
-#: src/main.c:432
+#: src/main.c:447
msgid "Copying configuration... This may take a while..."
msgstr ""
-#: src/main.c:441
+#: src/main.c:456
msgid "Migration failed!"
msgstr ""
-#: src/main.c:450
+#: src/main.c:465
msgid "Migrating configuration..."
msgstr ""
-#: src/main.c:993
+#: src/main.c:1019 src/plugins/trayicon/trayicon.c:436
+msgid "Failed to register folder item update hook"
+msgstr ""
+
+#: src/main.c:1026 src/plugins/trayicon/trayicon.c:442
+msgid "Failed to register folder update hook"
+msgstr ""
+
+#: src/main.c:1178
msgid "g_thread is not supported by glib.\n"
msgstr ""
-#: src/main.c:999
+#: src/main.c:1184
msgid ""
"Claws Mail has been compiled with a more recent GTK+ library than is "
"currently available. This will cause crashes. You need to upgrade GTK+ or "
"recompile Claws Mail."
msgstr ""
-#: src/main.c:1011
+#: src/main.c:1196
msgid ""
"Claws Mail has been compiled with an older GTK+ library than is currently "
"available. This will cause crashes. You need to recompile Claws Mail."
msgstr ""
-#: src/main.c:1048
+#: src/main.c:1224
msgid "Sylpheed-Claws 2.6.0 (or older)"
msgstr ""
-#: src/main.c:1051
+#: src/main.c:1227
msgid "Sylpheed-Claws 1.9.15 (or older)"
msgstr ""
-#: src/main.c:1054
+#: src/main.c:1230
msgid "Sylpheed-Claws 1.0.5 (or older)"
msgstr ""
-#: src/main.c:1338
+#: src/main.c:1533
+#, c-format
msgid ""
-"Some plugin(s) failed to load. Check the Plugins configuration for more "
-"information."
-msgstr ""
+"The following plugin failed to load. Check the Plugins configuration for "
+"more information:\n"
+"%s"
+msgid_plural ""
+"The following plugins failed to load. Check the Plugins configuration for "
+"more information:\n"
+"%s"
+msgstr[0] ""
+msgstr[1] ""
-#: src/main.c:1357
+#: src/main.c:1561
msgid ""
"Claws Mail has detected a configured mailbox, but it is incomplete. It is "
"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
"mailbox parent folder's context menu to try to fix it."
msgstr ""
-#: src/main.c:1363
+#: src/main.c:1567
msgid ""
"Claws Mail has detected a configured mailbox, but could not load it. It is "
"probably provided by an out-of-date external plugin. Please reinstall the "
"plugin and try again."
msgstr ""
-#: src/main.c:1392
+#: src/main.c:1596
#, c-format
msgid "Claws Mail can not start without its data volume (%s)."
msgstr ""
-#: src/main.c:1697
+#: src/main.c:1899
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr ""
-#: src/main.c:1699
+#: src/main.c:1901
msgid " --compose [address] open composition window"
msgstr ""
-#: src/main.c:1700
+#: src/main.c:1902
msgid " --subscribe [uri] subscribe to the given URI if possible"
msgstr ""
-#: src/main.c:1701
+#: src/main.c:1903
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
" attached"
msgstr ""
-#: src/main.c:1704
+#: src/main.c:1906
msgid " --receive receive new messages"
msgstr ""
-#: src/main.c:1705
+#: src/main.c:1907
msgid " --receive-all receive new messages of all accounts"
msgstr ""
-#: src/main.c:1706
+#: src/main.c:1908
msgid " --send send all queued messages"
msgstr ""
-#: src/main.c:1707
+#: src/main.c:1909
msgid " --status [folder]... show the total number of messages"
msgstr ""
-#: src/main.c:1708
+#: src/main.c:1910
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr ""
-#: src/main.c:1710
+#: src/main.c:1912
msgid ""
" --select folder[/msg] jumps to the specified folder/message\n"
" folder is a folder id like 'folder/sub_folder'"
msgstr ""
-#: src/main.c:1712
+#: src/main.c:1914
msgid " --online switch to online mode"
msgstr ""
-#: src/main.c:1713
+#: src/main.c:1915
msgid " --offline switch to offline mode"
msgstr ""
-#: src/main.c:1714
+#: src/main.c:1916
msgid " --exit --quit -q exit Claws Mail"
msgstr ""
-#: src/main.c:1715
+#: src/main.c:1917
msgid " --debug debug mode"
msgstr ""
-#: src/main.c:1716
+#: src/main.c:1918
msgid " --help -h display this help and exit"
msgstr ""
-#: src/main.c:1717
+#: src/main.c:1919
msgid " --version -v output version information and exit"
msgstr ""
-#: src/main.c:1718
+#: src/main.c:1920
msgid ""
" --version-full -V output version and built-in features information "
"and exit"
msgstr ""
-#: src/main.c:1719
+#: src/main.c:1921
msgid " --config-dir output configuration directory"
msgstr ""
-#: src/main.c:1720
+#: src/main.c:1922
msgid ""
" --alternate-config-dir [dir]\n"
" use specified configuration directory"
msgstr ""
-#: src/main.c:1767
+#: src/main.c:1972
msgid "Unknown option\n"
msgstr ""
-#: src/main.c:1785
+#: src/main.c:1990
#, c-format
msgid "Processing (%s)..."
msgstr ""
-#: src/main.c:1788
+#: src/main.c:1993
msgid "top level folder"
msgstr ""
-#: src/main.c:1867
+#: src/main.c:2076
msgid "Queued messages"
msgstr ""
-#: src/main.c:1868
+#: src/main.c:2077
msgid "Some unsent messages are queued. Exit now?"
msgstr ""
-#: src/mainwindow.c:533 src/messageview.c:217
-msgid "/_File"
+#: src/main.c:2548
+msgid "NetworkManager: network is online.\n"
msgstr ""
-#: src/mainwindow.c:534
-msgid "/_File/_Add mailbox"
+#: src/main.c:2554
+msgid "NetworkManager: network is offline.\n"
msgstr ""
-#: src/mainwindow.c:535
-msgid "/_File/_Add mailbox/MH..."
+#: src/mainwindow.c:458 src/messageview.c:186
+msgid "_File"
msgstr ""
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:543
-#: src/mainwindow.c:545 src/mainwindow.c:551 src/mainwindow.c:554
-#: src/messageview.c:223
-msgid "/_File/---"
+#: src/mainwindow.c:460 src/messageview.c:188
+msgid "_View"
msgstr ""
-#: src/mainwindow.c:537
-msgid "/_File/Change folder order..."
+#: src/mainwindow.c:463
+msgid "_Configuration"
msgstr ""
-#: src/mainwindow.c:539
-msgid "/_File/_Import mbox file..."
+#: src/mainwindow.c:467
+msgid "_Add mailbox"
msgstr ""
-#: src/mainwindow.c:540
-msgid "/_File/_Export to mbox file..."
+#: src/mainwindow.c:468
+msgid "MH..."
msgstr ""
-#: src/mainwindow.c:541
-msgid "/_File/Exp_ort selected to mbox file..."
+#: src/mainwindow.c:471
+msgid "Change folder order..."
msgstr ""
-#: src/mainwindow.c:544
-msgid "/_File/Empty all _Trash folders"
-msgstr "/_File/Empty all Was_tebin folders"
-
-#: src/mainwindow.c:546 src/messageview.c:218
-msgid "/_File/_Save as..."
+#: src/mainwindow.c:474
+msgid "_Import mbox file..."
msgstr ""
-#: src/mainwindow.c:548 src/messageview.c:220
-msgid "/_File/Page setup..."
+#: src/mainwindow.c:475
+msgid "_Export to mbox file..."
msgstr ""
-#: src/mainwindow.c:550 src/messageview.c:222
-msgid "/_File/_Print..."
+#: src/mainwindow.c:476
+msgid "_Export selected to mbox file..."
msgstr ""
-#: src/mainwindow.c:552
-msgid "/_File/_Work offline"
-msgstr ""
+#: src/mainwindow.c:478
+msgid "Empty all _Trash folders"
+msgstr "Empty all Was_tebin folders"
-#: src/mainwindow.c:553
-msgid "/_File/Synchronise folders"
+#: src/mainwindow.c:481 src/messageview.c:195 src/summaryview.c:580
+msgid "_Save as..."
msgstr ""
-#: src/mainwindow.c:556
-msgid "/_File/E_xit"
+#: src/mainwindow.c:484 src/messageview.c:197
+msgid "Page setup..."
msgstr ""
-#: src/mainwindow.c:561
-msgid "/_Edit/Select _thread"
+#: src/mainwindow.c:486 src/messageview.c:199
+msgid "_Print..."
msgstr ""
-#: src/mainwindow.c:562
-msgid "/_Edit/_Delete thread"
+#: src/mainwindow.c:488
+msgid "Synchronise folders"
msgstr ""
-#: src/mainwindow.c:564 src/messageview.c:230
-msgid "/_Edit/_Find in current message..."
+#: src/mainwindow.c:490
+msgid "E_xit"
msgstr ""
-#: src/mainwindow.c:566
-msgid "/_Edit/_Search folder..."
+#: src/mainwindow.c:495
+msgid "Select _thread"
msgstr ""
-#: src/mainwindow.c:567
-msgid "/_Edit/_Quick search"
+#: src/mainwindow.c:496
+msgid "_Delete thread"
msgstr ""
-#: src/mainwindow.c:568 src/messageview.c:233 src/summaryview.c:528
-msgid "/_View"
+#: src/mainwindow.c:498
+msgid "_Find in current message..."
msgstr ""
-#: src/mainwindow.c:569
-msgid "/_View/Show or hi_de"
+#: src/mainwindow.c:500
+msgid "_Quick search"
msgstr ""
-#: src/mainwindow.c:570
-msgid "/_View/Show or hi_de/_Toolbar"
+#: src/mainwindow.c:503
+msgid "Show or hi_de"
msgstr ""
-#: src/mainwindow.c:572
-msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
+#: src/mainwindow.c:504
+msgid "_Toolbar"
msgstr ""
-#: src/mainwindow.c:574
-msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
+#: src/mainwindow.c:506
+msgid "Set displayed _columns"
msgstr ""
-#: src/mainwindow.c:576
-msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
+#: src/mainwindow.c:507
+msgid "in _Folder list..."
msgstr ""
-#: src/mainwindow.c:578
-msgid "/_View/Show or hi_de/_Toolbar/_Text only"
+#: src/mainwindow.c:508
+msgid "in _Message list..."
msgstr ""
-#: src/mainwindow.c:581
-msgid "/_View/Show or hi_de/_Toolbar/_Hide"
+#: src/mainwindow.c:513
+msgid "La_yout"
msgstr ""
-#: src/mainwindow.c:584
-msgid "/_View/Show or hi_de/_Message view"
+#: src/mainwindow.c:516
+msgid "_Sort"
msgstr ""
-#: src/mainwindow.c:587
-msgid "/_View/Show or hi_de/Status _bar"
+#: src/mainwindow.c:518
+msgid "_Attract by subject"
msgstr ""
-#: src/mainwindow.c:590
-msgid "/_View/Show or hi_de/Column headers"
+#: src/mainwindow.c:520
+msgid "E_xpand all threads"
msgstr ""
-#: src/mainwindow.c:592
-msgid "/_View/Set displayed _columns"
+#: src/mainwindow.c:521
+msgid "Co_llapse all threads"
msgstr ""
-#: src/mainwindow.c:593
-msgid "/_View/Set displayed _columns/in _Folder list..."
+#: src/mainwindow.c:523 src/messageview.c:210
+msgid "_Go to"
msgstr ""
-#: src/mainwindow.c:594
-msgid "/_View/Set displayed _columns/in _Message list..."
+#: src/mainwindow.c:524 src/messageview.c:211
+msgid "_Previous message"
msgstr ""
-#: src/mainwindow.c:596 src/mainwindow.c:604 src/mainwindow.c:634
-#: src/mainwindow.c:664 src/mainwindow.c:780 src/mainwindow.c:788
-#: src/messageview.c:263 src/messageview.c:369
-msgid "/_View/---"
+#: src/mainwindow.c:525 src/messageview.c:212
+msgid "_Next message"
msgstr ""
-#: src/mainwindow.c:598
-msgid "/_View/La_yout"
+#: src/mainwindow.c:527 src/messageview.c:214
+msgid "P_revious unread message"
msgstr ""
-#: src/mainwindow.c:599
-msgid "/_View/Layout/_Standard"
+#: src/mainwindow.c:528 src/messageview.c:215
+msgid "N_ext unread message"
msgstr ""
-#: src/mainwindow.c:600
-msgid "/_View/Layout/_Three columns"
+#: src/mainwindow.c:530 src/messageview.c:217
+msgid "Previous ne_w message"
msgstr ""
-#: src/mainwindow.c:601
-msgid "/_View/Layout/_Wide message"
+#: src/mainwindow.c:531 src/messageview.c:218
+msgid "Ne_xt new message"
msgstr ""
-#: src/mainwindow.c:602
-msgid "/_View/Layout/W_ide message list"
+#: src/mainwindow.c:533 src/messageview.c:220
+msgid "Previous _marked message"
msgstr ""
-#: src/mainwindow.c:603
-msgid "/_View/Layout/S_mall screen"
+#: src/mainwindow.c:534 src/messageview.c:221
+msgid "Next m_arked message"
msgstr ""
-#: src/mainwindow.c:606
-msgid "/_View/_Sort"
-msgstr ""
+#: src/mainwindow.c:536 src/messageview.c:223
+msgid "Previous _labeled message"
+msgstr "Previous _labelled message"
-#: src/mainwindow.c:607
-msgid "/_View/_Sort/by _number"
+#: src/mainwindow.c:537 src/messageview.c:224
+msgid "Next la_beled message"
+msgstr "Next la_belled message"
+
+#: src/mainwindow.c:539 src/messageview.c:226
+msgid "Last read message"
msgstr ""
-#: src/mainwindow.c:608
-msgid "/_View/_Sort/by S_ize"
+#: src/mainwindow.c:540 src/messageview.c:227
+msgid "Parent message"
msgstr ""
-#: src/mainwindow.c:609
-msgid "/_View/_Sort/by _Date"
+#: src/mainwindow.c:542 src/messageview.c:229
+msgid "Next unread _folder"
msgstr ""
-#: src/mainwindow.c:610
-msgid "/_View/_Sort/by Thread date"
+#: src/mainwindow.c:543 src/messageview.c:230
+msgid "_Other folder..."
msgstr ""
-#: src/mainwindow.c:611
-msgid "/_View/_Sort/by _From"
+#: src/mainwindow.c:561 src/messageview.c:248
+msgid "Decode"
msgstr ""
-#: src/mainwindow.c:612
-msgid "/_View/_Sort/by _To"
+#: src/mainwindow.c:568 src/summaryview.c:577
+msgid "Open in new _window"
msgstr ""
-#: src/mainwindow.c:613
-msgid "/_View/_Sort/by S_ubject"
+#: src/mainwindow.c:569 src/messageview.c:255
+msgid "Mess_age source"
msgstr ""
-#: src/mainwindow.c:614
-msgid "/_View/_Sort/by _color label"
-msgstr "/_View/_Sort/by _colour label"
+#: src/mainwindow.c:570 src/messageview.c:257
+msgid "Quotes"
+msgstr ""
-#: src/mainwindow.c:615
-msgid "/_View/_Sort/by tag"
+#: src/mainwindow.c:572
+msgid "_Update summary"
msgstr ""
-#: src/mainwindow.c:616
-msgid "/_View/_Sort/by _mark"
+#: src/mainwindow.c:575
+msgid "Recei_ve"
msgstr ""
-#: src/mainwindow.c:617
-msgid "/_View/_Sort/by _status"
+#: src/mainwindow.c:576
+msgid "Get from _current account"
msgstr ""
-#: src/mainwindow.c:618
-msgid "/_View/_Sort/by a_ttachment"
+#: src/mainwindow.c:577
+msgid "Get from _all accounts"
msgstr ""
-#: src/mainwindow.c:620
-msgid "/_View/_Sort/by score"
+#: src/mainwindow.c:578
+msgid "Cancel receivin_g"
msgstr ""
-#: src/mainwindow.c:621
-msgid "/_View/_Sort/by locked"
+#: src/mainwindow.c:581
+msgid "_Send queued messages"
msgstr ""
-#: src/mainwindow.c:622
-msgid "/_View/_Sort/D_on't sort"
+#: src/mainwindow.c:585
+msgid "Compose a_n email message"
msgstr ""
-#: src/mainwindow.c:623 src/mainwindow.c:626
-msgid "/_View/_Sort/---"
+#: src/mainwindow.c:586
+msgid "Compose a news message"
msgstr ""
-#: src/mainwindow.c:624
-msgid "/_View/_Sort/Ascending"
+#: src/mainwindow.c:588 src/messageview.c:263 src/summaryview.c:511
+msgid "_Reply"
msgstr ""
-#: src/mainwindow.c:625
-msgid "/_View/_Sort/Descending"
+#: src/mainwindow.c:589 src/messageview.c:264
+msgid "Repl_y to"
msgstr ""
-#: src/mainwindow.c:627
-msgid "/_View/_Sort/_Attract by subject"
+#: src/mainwindow.c:590 src/messageview.c:265 src/summaryview.c:514
+msgid "_all"
msgstr ""
-#: src/mainwindow.c:629
-msgid "/_View/Th_read view"
+#: src/mainwindow.c:591 src/messageview.c:266 src/summaryview.c:515
+msgid "_sender"
msgstr ""
-#: src/mainwindow.c:630
-msgid "/_View/E_xpand all threads"
+#: src/mainwindow.c:592 src/messageview.c:267
+msgid "mailing _list"
msgstr ""
-#: src/mainwindow.c:631
-msgid "/_View/Co_llapse all threads"
+#: src/mainwindow.c:593
+msgid "Follow-up and reply to"
msgstr ""
-#: src/mainwindow.c:632
-msgid "/_View/_Hide read messages"
+#: src/mainwindow.c:596 src/messageview.c:270 src/summaryview.c:520
+#: src/toolbar.c:2015
+msgid "_Forward"
msgstr ""
-#: src/mainwindow.c:635 src/messageview.c:234
-msgid "/_View/_Go to"
+#: src/mainwindow.c:597 src/messageview.c:271 src/summaryview.c:522
+#: src/toolbar.c:2016
+msgid "For_ward as attachment"
msgstr ""
-#: src/mainwindow.c:636 src/messageview.c:235
-msgid "/_View/_Go to/_Previous message"
+#: src/mainwindow.c:598 src/messageview.c:272 src/toolbar.c:2017
+msgid "Redirec_t"
msgstr ""
-#: src/mainwindow.c:637 src/messageview.c:236
-msgid "/_View/_Go to/_Next message"
+#: src/mainwindow.c:600
+msgid "Mailing-_List"
msgstr ""
-#: src/mainwindow.c:638 src/mainwindow.c:643 src/mainwindow.c:646
-#: src/mainwindow.c:651 src/mainwindow.c:656 src/mainwindow.c:661
-#: src/messageview.c:237 src/messageview.c:242 src/messageview.c:245
-#: src/messageview.c:250 src/messageview.c:255 src/messageview.c:260
-msgid "/_View/_Go to/---"
+#: src/mainwindow.c:601
+msgid "Post"
msgstr ""
-#: src/mainwindow.c:639 src/messageview.c:238
-msgid "/_View/_Go to/P_revious unread message"
+#: src/mainwindow.c:603
+msgid "Help"
msgstr ""
-#: src/mainwindow.c:641 src/messageview.c:240
-msgid "/_View/_Go to/N_ext unread message"
+#: src/mainwindow.c:607
+msgid "Unsubscribe"
msgstr ""
-#: src/mainwindow.c:644 src/messageview.c:243
-msgid "/_View/_Go to/Previous ne_w message"
+#: src/mainwindow.c:609
+msgid "View archive"
msgstr ""
-#: src/mainwindow.c:645 src/messageview.c:244
-msgid "/_View/_Go to/Ne_xt new message"
+#: src/mainwindow.c:611
+msgid "Contact owner"
msgstr ""
-#: src/mainwindow.c:647 src/messageview.c:246
-msgid "/_View/_Go to/Previous _marked message"
+#: src/mainwindow.c:615 src/summaryview.c:526
+msgid "M_ove..."
msgstr ""
-#: src/mainwindow.c:649 src/messageview.c:248
-msgid "/_View/_Go to/Next m_arked message"
+#: src/mainwindow.c:616 src/summaryview.c:527
+msgid "_Copy..."
msgstr ""
-#: src/mainwindow.c:652 src/messageview.c:251
-msgid "/_View/_Go to/Previous _labeled message"
-msgstr "/_View/_Go to/Previous _labelled message"
+#: src/mainwindow.c:617 src/summaryview.c:528
+msgid "Move to _trash"
+msgstr "Move to was_tebin"
-#: src/mainwindow.c:654 src/messageview.c:253
-msgid "/_View/_Go to/Next la_beled message"
-msgstr "/_View/_Go to/Next la_belled message"
+#: src/mainwindow.c:618 src/summaryview.c:530
+msgid "_Delete..."
+msgstr ""
-#: src/mainwindow.c:657 src/messageview.c:256
-msgid "/_View/_Go to/Last read message"
+#: src/mainwindow.c:619
+msgid "Cancel a news message"
msgstr ""
-#: src/mainwindow.c:659 src/messageview.c:258
-msgid "/_View/_Go to/Parent message"
+#: src/mainwindow.c:623 src/summaryview.c:534
+msgid "_Mark"
msgstr ""
-#: src/mainwindow.c:662 src/messageview.c:261
-msgid "/_View/_Go to/Next unread _folder"
+#: src/mainwindow.c:624 src/summaryview.c:535
+msgid "_Unmark"
msgstr ""
-#: src/mainwindow.c:663 src/messageview.c:262
-msgid "/_View/_Go to/_Other folder..."
+#: src/mainwindow.c:627 src/summaryview.c:538
+msgid "Mark as unr_ead"
msgstr ""
-#: src/mainwindow.c:667 src/messageview.c:266
-msgid "/_View/Character _encoding/---"
+#: src/mainwindow.c:628 src/summaryview.c:539
+msgid "Mark as rea_d"
msgstr ""
-#: src/mainwindow.c:671 src/messageview.c:270
-msgid "/_View/Character _encoding"
+#: src/mainwindow.c:629 src/summaryview.c:540
+msgid "Mark all read"
msgstr ""
-#: src/mainwindow.c:672 src/messageview.c:271
-msgid "/_View/Character _encoding/_Auto detect"
+#: src/mainwindow.c:630 src/prefs_filtering_action.c:184 src/summaryview.c:541
+#: src/toolbar.c:194 src/toolbar.c:401
+msgid "Ignore thread"
msgstr ""
-#: src/mainwindow.c:676 src/messageview.c:274
-msgid "/_View/Character _encoding/7bit ASCII (US-ASC_II)"
+#: src/mainwindow.c:631 src/summaryview.c:542
+msgid "Unignore thread"
msgstr ""
-#: src/mainwindow.c:678 src/messageview.c:277
-msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+#: src/mainwindow.c:632 src/prefs_filtering_action.c:185 src/summaryview.c:543
+#: src/toolbar.c:195 src/toolbar.c:402
+msgid "Watch thread"
msgstr ""
-#: src/mainwindow.c:682
-msgid "/_View/Character _encoding/Western European"
+#: src/mainwindow.c:633 src/summaryview.c:544
+msgid "Unwatch thread"
msgstr ""
-#: src/mainwindow.c:683
-msgid "/_View/Character _encoding/Western European/ISO-8859-_1"
+#: src/mainwindow.c:636 src/prefs_filtering_action.c:172 src/summaryview.c:547
+msgid "Mark as spam"
msgstr ""
-#: src/mainwindow.c:685
-msgid "/_View/Character _encoding/Western European/ISO-8859-15"
+#: src/mainwindow.c:637 src/prefs_filtering_action.c:173 src/summaryview.c:548
+msgid "Mark as ham"
msgstr ""
-#: src/mainwindow.c:687
-msgid "/_View/Character _encoding/Western European/Windows-1252"
+#: src/mainwindow.c:640 src/prefs_filtering_action.c:168 src/summaryview.c:551
+msgid "Lock"
msgstr ""
-#: src/mainwindow.c:690 src/messageview.c:287
-msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+#: src/mainwindow.c:641 src/prefs_filtering_action.c:169 src/summaryview.c:552
+msgid "Unlock"
msgstr ""
-#: src/mainwindow.c:693
-msgid "/_View/Character _encoding/Baltic"
+#: src/mainwindow.c:643
+msgid "Color la_bel"
+msgstr "Colour la_bel"
+
+#: src/mainwindow.c:644
+msgid "Ta_gs"
msgstr ""
-#: src/mainwindow.c:694
-msgid "/_View/Character _encoding/Baltic/ISO-8859-13"
+#: src/mainwindow.c:647
+msgid "Re-_edit"
msgstr ""
-#: src/mainwindow.c:696
-msgid "/_View/Character _encoding/Baltic/ISO-8859-_4"
+#: src/mainwindow.c:652 src/messageview.c:276 src/summaryview.c:559
+msgid "Add sender to address boo_k"
msgstr ""
-#: src/mainwindow.c:699 src/messageview.c:295
-msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+#: src/mainwindow.c:654
+msgid "C_ollect addresses"
msgstr ""
-#: src/mainwindow.c:702
-msgid "/_View/Character _encoding/Hebrew"
+#: src/mainwindow.c:655
+msgid "from Current _folder..."
msgstr ""
-#: src/mainwindow.c:703
-msgid "/_View/Character _encoding/Hebrew/ISO-8859-_8"
+#: src/mainwindow.c:656
+msgid "from Selected _messages..."
msgstr ""
-#: src/mainwindow.c:705
-msgid "/_View/Character _encoding/Hebrew/Windows-1255"
+#: src/mainwindow.c:659
+msgid "_Filter all messages in folder"
msgstr ""
-#: src/mainwindow.c:708
-msgid "/_View/Character _encoding/Arabic"
+#: src/mainwindow.c:660
+msgid "Filter _selected messages"
msgstr ""
-#: src/mainwindow.c:709
-msgid "/_View/Character _encoding/Arabic/ISO-8859-_6"
+#: src/mainwindow.c:661
+msgid "Run folder pr_ocessing rules"
msgstr ""
-#: src/mainwindow.c:711
-msgid "/_View/Character _encoding/Arabic/Windows-1256"
+#: src/mainwindow.c:663
+msgid "_Create filter rule"
msgstr ""
-#: src/mainwindow.c:714 src/messageview.c:308
-msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+#: src/mainwindow.c:664 src/mainwindow.c:670 src/messageview.c:280
+#: src/messageview.c:286 src/summaryview.c:562 src/summaryview.c:569
+msgid "_Automatically"
msgstr ""
-#: src/mainwindow.c:717
-msgid "/_View/Character _encoding/Cyrillic"
+#: src/mainwindow.c:665 src/mainwindow.c:671 src/messageview.c:281
+#: src/messageview.c:287 src/summaryview.c:563 src/summaryview.c:570
+msgid "By _From"
msgstr ""
-#: src/mainwindow.c:718
-msgid "/_View/Character _encoding/Cyrillic/ISO-8859-_5"
-msgstr ""
-
-#: src/mainwindow.c:720
-msgid "/_View/Character _encoding/Cyrillic/KOI8-_R"
-msgstr ""
-
-#: src/mainwindow.c:722
-msgid "/_View/Character _encoding/Cyrillic/KOI8-U"
-msgstr ""
-
-#: src/mainwindow.c:724
-msgid "/_View/Character _encoding/Cyrillic/Windows-1251"
-msgstr ""
-
-#: src/mainwindow.c:727
-msgid "/_View/Character _encoding/Japanese"
-msgstr ""
-
-#: src/mainwindow.c:728
-msgid "/_View/Character _encoding/Japanese/ISO-2022-_JP"
-msgstr ""
-
-#: src/mainwindow.c:730
-msgid "/_View/Character _encoding/Japanese/ISO-2022-JP-2"
-msgstr ""
-
-#: src/mainwindow.c:732
-msgid "/_View/Character _encoding/Japanese/_EUC-JP"
-msgstr ""
-
-#: src/mainwindow.c:734
-msgid "/_View/Character _encoding/Japanese/_Shift__JIS"
-msgstr ""
-
-#: src/mainwindow.c:737
-msgid "/_View/Character _encoding/Chinese"
-msgstr ""
-
-#: src/mainwindow.c:738
-msgid "/_View/Character _encoding/Chinese/Simplified (_GB2312)"
-msgstr ""
-
-#: src/mainwindow.c:740
-msgid "/_View/Character _encoding/Chinese/Simplified (GBK)"
-msgstr ""
-
-#: src/mainwindow.c:742
-msgid "/_View/Character _encoding/Chinese/Traditional (_Big5)"
-msgstr ""
-
-#: src/mainwindow.c:744
-msgid "/_View/Character _encoding/Chinese/Traditional (EUC-_TW)"
-msgstr ""
-
-#: src/mainwindow.c:746
-msgid "/_View/Character _encoding/Chinese/ISO-2022-_CN"
-msgstr ""
-
-#: src/mainwindow.c:749
-msgid "/_View/Character _encoding/Korean"
-msgstr ""
-
-#: src/mainwindow.c:750
-msgid "/_View/Character _encoding/Korean/EUC-_KR"
-msgstr ""
-
-#: src/mainwindow.c:752
-msgid "/_View/Character _encoding/Korean/ISO-2022-KR"
-msgstr ""
-
-#: src/mainwindow.c:755
-msgid "/_View/Character _encoding/Thai"
-msgstr ""
-
-#: src/mainwindow.c:756
-msgid "/_View/Character _encoding/Thai/TIS-620"
-msgstr ""
-
-#: src/mainwindow.c:758
-msgid "/_View/Character _encoding/Thai/Windows-874"
-msgstr ""
-
-#: src/mainwindow.c:765 src/mainwindow.c:771 src/messageview.c:354
-#: src/messageview.c:360
-msgid "/_View/Decode/---"
-msgstr ""
-
-#: src/mainwindow.c:768 src/messageview.c:357
-msgid "/_View/Decode"
-msgstr ""
-
-#: src/mainwindow.c:769 src/messageview.c:358
-msgid "/_View/Decode/_Auto detect"
-msgstr ""
-
-#: src/mainwindow.c:772 src/messageview.c:361
-msgid "/_View/Decode/_8bit"
-msgstr ""
-
-#: src/mainwindow.c:773 src/messageview.c:362
-msgid "/_View/Decode/_Quoted printable"
-msgstr ""
-
-#: src/mainwindow.c:774 src/messageview.c:363
-msgid "/_View/Decode/_Base64"
-msgstr ""
-
-#: src/mainwindow.c:775 src/messageview.c:364
-msgid "/_View/Decode/_Uuencode"
-msgstr ""
-
-#: src/mainwindow.c:781 src/summaryview.c:529
-msgid "/_View/Open in new _window"
-msgstr ""
-
-#: src/mainwindow.c:782 src/messageview.c:370
-msgid "/_View/Mess_age source"
-msgstr ""
-
-#: src/mainwindow.c:783
-msgid "/_View/All headers"
-msgstr ""
-
-#: src/mainwindow.c:784 src/messageview.c:372
-msgid "/_View/Quotes"
+#: src/mainwindow.c:666 src/mainwindow.c:672 src/messageview.c:282
+#: src/messageview.c:288 src/summaryview.c:564 src/summaryview.c:571
+msgid "By _To"
msgstr ""
-#: src/mainwindow.c:785 src/messageview.c:373
-msgid "/_View/Quotes/_Fold all"
+#: src/mainwindow.c:667 src/mainwindow.c:673 src/messageview.c:283
+#: src/messageview.c:289 src/summaryview.c:565 src/summaryview.c:572
+msgid "By _Subject"
msgstr ""
-#: src/mainwindow.c:786 src/messageview.c:374
-msgid "/_View/Quotes/Fold from level _2"
+#: src/mainwindow.c:669 src/summaryview.c:568
+msgid "Create processing rule"
msgstr ""
-#: src/mainwindow.c:787 src/messageview.c:375
-msgid "/_View/Quotes/Fold from level _3"
+#: src/mainwindow.c:676 src/messageview.c:293
+msgid "List _URLs..."
msgstr ""
-#: src/mainwindow.c:789
-msgid "/_View/_Update summary"
-msgstr ""
-
-#: src/mainwindow.c:792
-msgid "/_Message/Recei_ve"
-msgstr ""
-
-#: src/mainwindow.c:793
-msgid "/_Message/Recei_ve/Get from _current account"
-msgstr ""
-
-#: src/mainwindow.c:795
-msgid "/_Message/Recei_ve/Get from _all accounts"
-msgstr ""
-
-#: src/mainwindow.c:797
-msgid "/_Message/Recei_ve/Cancel receivin_g"
-msgstr ""
-
-#: src/mainwindow.c:799
-msgid "/_Message/Recei_ve/---"
-msgstr ""
-
-#: src/mainwindow.c:800
-msgid "/_Message/_Send queued messages"
-msgstr ""
-
-#: src/mainwindow.c:802
-msgid "/_Message/Compose a_n email message"
-msgstr ""
-
-#: src/mainwindow.c:803
-msgid "/_Message/Compose a news message"
-msgstr ""
-
-#: src/mainwindow.c:804 src/messageview.c:381
-msgid "/_Message/_Reply"
-msgstr ""
-
-#: src/mainwindow.c:805
-msgid "/_Message/Repl_y to"
-msgstr ""
-
-#: src/mainwindow.c:806 src/messageview.c:382
-msgid "/_Message/Repl_y to/_all"
-msgstr ""
-
-#: src/mainwindow.c:807 src/messageview.c:384
-msgid "/_Message/Repl_y to/_sender"
-msgstr ""
-
-#: src/mainwindow.c:808 src/messageview.c:386
-msgid "/_Message/Repl_y to/mailing _list"
-msgstr ""
-
-#: src/mainwindow.c:810
-msgid "/_Message/Follow-up and reply to"
-msgstr ""
-
-#: src/mainwindow.c:812 src/messageview.c:389
-msgid "/_Message/_Forward"
-msgstr ""
-
-#: src/mainwindow.c:813 src/messageview.c:390
-msgid "/_Message/For_ward as attachment"
-msgstr ""
-
-#: src/mainwindow.c:814
-msgid "/_Message/Redirect"
-msgstr ""
-
-#: src/mainwindow.c:816
-msgid "/_Message/Mailing-_List"
-msgstr ""
-
-#: src/mainwindow.c:817
-msgid "/_Message/Mailing-_List/Post"
-msgstr ""
-
-#: src/mainwindow.c:818
-msgid "/_Message/Mailing-_List/Help"
-msgstr ""
-
-#: src/mainwindow.c:819
-msgid "/_Message/Mailing-_List/Subscribe"
-msgstr ""
-
-#: src/mainwindow.c:820
-msgid "/_Message/Mailing-_List/Unsubscribe"
-msgstr ""
-
-#: src/mainwindow.c:821
-msgid "/_Message/Mailing-_List/View archive"
-msgstr ""
-
-#: src/mainwindow.c:822
-msgid "/_Message/Mailing-_List/Contact owner"
-msgstr ""
-
-#: src/mainwindow.c:825
-msgid "/_Message/M_ove..."
-msgstr ""
-
-#: src/mainwindow.c:826
-msgid "/_Message/_Copy..."
-msgstr ""
-
-#: src/mainwindow.c:827
-msgid "/_Message/Move to _trash"
-msgstr "/_Message/Move to was_tebin"
-
-#: src/mainwindow.c:828
-msgid "/_Message/_Delete..."
-msgstr ""
-
-#: src/mainwindow.c:829
-msgid "/_Message/Cancel a news message"
-msgstr ""
-
-#: src/mainwindow.c:831
-msgid "/_Message/_Mark"
+#: src/mainwindow.c:683
+msgid "Ch_eck for new messages in all folders"
msgstr ""
-#: src/mainwindow.c:832
-msgid "/_Message/_Mark/_Mark"
+#: src/mainwindow.c:684
+msgid "Delete du_plicated messages"
msgstr ""
-#: src/mainwindow.c:833
-msgid "/_Message/_Mark/_Unmark"
+#: src/mainwindow.c:685
+msgid "In selected folder"
msgstr ""
-#: src/mainwindow.c:834 src/mainwindow.c:842 src/mainwindow.c:845
-msgid "/_Message/_Mark/---"
+#: src/mainwindow.c:686
+msgid "In all folders"
msgstr ""
-#: src/mainwindow.c:835
-msgid "/_Message/_Mark/Mark as unr_ead"
+#: src/mainwindow.c:689
+msgid "E_xecute"
msgstr ""
-#: src/mainwindow.c:836
-msgid "/_Message/_Mark/Mark as rea_d"
+#: src/mainwindow.c:692
+msgid "SSL cer_tificates"
msgstr ""
-#: src/mainwindow.c:837
-msgid "/_Message/_Mark/Mark all _read"
+#: src/mainwindow.c:696
+msgid "Filtering Lo_g"
msgstr ""
-#: src/mainwindow.c:838
-msgid "/_Message/_Mark/Ignore thread"
+#: src/mainwindow.c:698
+msgid "Network _Log"
msgstr ""
-#: src/mainwindow.c:839
-msgid "/_Message/_Mark/Unignore thread"
+#: src/mainwindow.c:700
+msgid "_Forget all session passwords"
msgstr ""
-#: src/mainwindow.c:840
-msgid "/_Message/_Mark/Watch thread"
+#: src/mainwindow.c:703
+msgid "C_hange current account"
msgstr ""
-#: src/mainwindow.c:841
-msgid "/_Message/_Mark/Unwatch thread"
+#: src/mainwindow.c:705
+msgid "_Preferences for current account..."
msgstr ""
-#: src/mainwindow.c:843
-msgid "/_Message/_Mark/Mark as _spam"
+#: src/mainwindow.c:706
+msgid "Create _new account..."
msgstr ""
-#: src/mainwindow.c:844
-msgid "/_Message/_Mark/Mark as _ham"
+#: src/mainwindow.c:707
+msgid "_Edit accounts..."
msgstr ""
-#: src/mainwindow.c:846
-msgid "/_Message/_Mark/Lock"
+#: src/mainwindow.c:710
+msgid "P_references..."
msgstr ""
-#: src/mainwindow.c:847
-msgid "/_Message/_Mark/Unlock"
+#: src/mainwindow.c:711
+msgid "Pre-pr_ocessing..."
msgstr ""
-#: src/mainwindow.c:848
-msgid "/_Message/Color la_bel"
-msgstr "/_Message/Colour la_bel"
-
-#: src/mainwindow.c:849
-msgid "/_Message/T_ags"
+#: src/mainwindow.c:712
+msgid "Post-pro_cessing..."
msgstr ""
-#: src/mainwindow.c:851
-msgid "/_Message/Re-_edit"
+#: src/mainwindow.c:713
+msgid "_Filtering..."
msgstr ""
-#: src/mainwindow.c:854
-msgid "/_Tools/_Address book..."
+#: src/mainwindow.c:714
+msgid "_Templates..."
msgstr ""
-#: src/mainwindow.c:855 src/messageview.c:396
-msgid "/_Tools/Add sender to address boo_k"
+#: src/mainwindow.c:715
+msgid "_Actions..."
msgstr ""
-#: src/mainwindow.c:857
-msgid "/_Tools/_Harvest addresses"
+#: src/mainwindow.c:716
+msgid "Tag_s..."
msgstr ""
-#: src/mainwindow.c:858
-msgid "/_Tools/_Harvest addresses/from _Folder..."
+#: src/mainwindow.c:718
+msgid "Plu_gins..."
msgstr ""
-#: src/mainwindow.c:860
-msgid "/_Tools/_Harvest addresses/from _Messages..."
+#: src/mainwindow.c:721
+msgid "_Manual"
msgstr ""
-#: src/mainwindow.c:863
-msgid "/_Tools/_Filter all messages in folder"
+#: src/mainwindow.c:722
+msgid "_Online User-contributed FAQ"
msgstr ""
-#: src/mainwindow.c:865
-msgid "/_Tools/Filter _selected messages"
+#: src/mainwindow.c:723
+msgid "Icon _Legend"
msgstr ""
-#: src/mainwindow.c:867
-msgid "/_Tools/Run folder processing rules"
+#: src/mainwindow.c:729
+msgid "Offline _mode"
msgstr ""
-#: src/mainwindow.c:869 src/messageview.c:399
-msgid "/_Tools/_Create filter rule"
+#: src/mainwindow.c:730
+msgid "_Message view"
msgstr ""
-#: src/mainwindow.c:870 src/messageview.c:401
-msgid "/_Tools/_Create filter rule/_Automatically"
+#: src/mainwindow.c:732
+msgid "Status _bar"
msgstr ""
-#: src/mainwindow.c:872 src/messageview.c:403
-msgid "/_Tools/_Create filter rule/by _From"
+#: src/mainwindow.c:734
+msgid "Column headers"
msgstr ""
-#: src/mainwindow.c:874 src/messageview.c:405
-msgid "/_Tools/_Create filter rule/by _To"
+#: src/mainwindow.c:735
+msgid "Th_read view"
msgstr ""
-#: src/mainwindow.c:876 src/messageview.c:407
-msgid "/_Tools/_Create filter rule/by _Subject"
+#: src/mainwindow.c:736
+msgid "_Hide read messages"
msgstr ""
-#: src/mainwindow.c:878
-msgid "/_Tools/C_reate processing rule"
+#: src/mainwindow.c:737 src/messageview.c:305
+msgid "Show all _headers"
msgstr ""
-#: src/mainwindow.c:879
-msgid "/_Tools/C_reate processing rule/_Automatically"
+#: src/mainwindow.c:738 src/messageview.c:306
+msgid "_Fold all"
msgstr ""
-#: src/mainwindow.c:881
-msgid "/_Tools/C_reate processing rule/by _From"
+#: src/mainwindow.c:739 src/messageview.c:307
+msgid "Fold from level _2"
msgstr ""
-#: src/mainwindow.c:883
-msgid "/_Tools/C_reate processing rule/by _To"
+#: src/mainwindow.c:740 src/messageview.c:308
+msgid "Fold from level _3"
msgstr ""
-#: src/mainwindow.c:885
-msgid "/_Tools/C_reate processing rule/by _Subject"
+#: src/mainwindow.c:744
+msgid "Text _below icons"
msgstr ""
-#: src/mainwindow.c:888 src/messageview.c:420
-msgid "/_Tools/List _URLs..."
+#: src/mainwindow.c:745
+msgid "Text be_side icons"
msgstr ""
-#: src/mainwindow.c:892
-msgid "/_Tools/Ch_eck for new messages in all folders"
+#: src/mainwindow.c:746
+msgid "_Icons only"
msgstr ""
-#: src/mainwindow.c:894
-msgid "/_Tools/Delete du_plicated messages"
+#: src/mainwindow.c:747
+msgid "_Text only"
msgstr ""
-#: src/mainwindow.c:896
-msgid "/_Tools/Delete du_plicated messages/In selected folder"
+#: src/mainwindow.c:749
+msgid "_Hide"
msgstr ""
-#: src/mainwindow.c:898
-msgid "/_Tools/Delete du_plicated messages/In all folders"
+#: src/mainwindow.c:754
+msgid "_Standard"
msgstr ""
-#: src/mainwindow.c:901
-msgid "/_Tools/E_xecute"
+#: src/mainwindow.c:755
+msgid "_Three columns"
msgstr ""
-#: src/mainwindow.c:904
-msgid "/_Tools/SSL cer_tificates..."
+#: src/mainwindow.c:756
+msgid "_Wide message"
msgstr ""
-#: src/mainwindow.c:908
-msgid "/_Tools/Filtering Log"
+#: src/mainwindow.c:757
+msgid "W_ide message list"
msgstr ""
-#: src/mainwindow.c:909
-msgid "/_Tools/Network _Log"
+#: src/mainwindow.c:758
+msgid "S_mall screen"
msgstr ""
-#: src/mainwindow.c:911
-msgid "/_Configuration"
+#: src/mainwindow.c:762
+msgid "by _Number"
msgstr ""
-#: src/mainwindow.c:912
-msgid "/_Configuration/C_hange current account"
+#: src/mainwindow.c:763
+msgid "by S_ize"
msgstr ""
-#: src/mainwindow.c:914
-msgid "/_Configuration/_Preferences for current account..."
+#: src/mainwindow.c:764
+msgid "by _Date"
msgstr ""
-#: src/mainwindow.c:916
-msgid "/_Configuration/Create _new account..."
+#: src/mainwindow.c:765
+msgid "by Thread date"
msgstr ""
-#: src/mainwindow.c:918
-msgid "/_Configuration/_Edit accounts..."
+#: src/mainwindow.c:766
+msgid "by _From"
msgstr ""
-#: src/mainwindow.c:920 src/mainwindow.c:932
-msgid "/_Configuration/---"
+#: src/mainwindow.c:767
+msgid "by _To"
msgstr ""
-#: src/mainwindow.c:921
-msgid "/_Configuration/P_references..."
+#: src/mainwindow.c:768
+msgid "by S_ubject"
msgstr ""
-#: src/mainwindow.c:923
-msgid "/_Configuration/Pre-pr_ocessing..."
-msgstr ""
+#: src/mainwindow.c:769
+msgid "by _Color label"
+msgstr "by _Colour label"
-#: src/mainwindow.c:925
-msgid "/_Configuration/Post-pro_cessing..."
+#: src/mainwindow.c:770
+msgid "by Tag"
msgstr ""
-#: src/mainwindow.c:927
-msgid "/_Configuration/_Filtering..."
+#: src/mainwindow.c:771
+msgid "by _Mark"
msgstr ""
-#: src/mainwindow.c:929
-msgid "/_Configuration/_Templates..."
+#: src/mainwindow.c:772
+msgid "by _Status"
msgstr ""
-#: src/mainwindow.c:930
-msgid "/_Configuration/_Actions..."
+#: src/mainwindow.c:773
+msgid "by A_ttachment"
msgstr ""
-#: src/mainwindow.c:931
-msgid "/_Configuration/Tag_s..."
+#: src/mainwindow.c:774
+msgid "by Score"
msgstr ""
-#: src/mainwindow.c:933
-msgid "/_Configuration/Plu_gins..."
+#: src/mainwindow.c:775
+msgid "by Locked"
msgstr ""
-#: src/mainwindow.c:936
-msgid "/_Help/_Manual"
+#: src/mainwindow.c:776
+msgid "D_on't sort"
msgstr ""
-#: src/mainwindow.c:937
-msgid "/_Help/_Online User-contributed FAQ"
+#: src/mainwindow.c:780
+msgid "Ascending"
msgstr ""
-#: src/mainwindow.c:939
-msgid "/_Help/Icon _Legend"
+#: src/mainwindow.c:781
+msgid "Descending"
msgstr ""
-#: src/mainwindow.c:940
-msgid "/_Help/---"
+#: src/mainwindow.c:821 src/messageview.c:348
+msgid "_Auto detect"
msgstr ""
-#: src/mainwindow.c:1294 src/summaryview.c:5716
+#: src/mainwindow.c:1185 src/summaryview.c:5987
msgid "Apply tags..."
msgstr ""
-#: src/mainwindow.c:1651
+#: src/mainwindow.c:1965
msgid "Some error(s) happened. Click here to view log."
msgstr ""
-#: src/mainwindow.c:1665
+#: src/mainwindow.c:1979
msgid "You are online. Click the icon to go offline"
msgstr ""
-#: src/mainwindow.c:1668
+#: src/mainwindow.c:1982
msgid "You are offline. Click the icon to go online"
msgstr ""
-#: src/mainwindow.c:1684
+#: src/mainwindow.c:1996
msgid "Select account"
msgstr ""
-#: src/mainwindow.c:1710 src/prefs_logging.c:139
+#: src/mainwindow.c:2022 src/prefs_logging.c:140
msgid "Network log"
msgstr ""
-#: src/mainwindow.c:1714
+#: src/mainwindow.c:2026
msgid "Filtering/processing debug log"
msgstr ""
-#: src/mainwindow.c:1733 src/prefs_logging.c:395
+#: src/mainwindow.c:2045 src/prefs_logging.c:392
msgid "filtering log enabled\n"
msgstr ""
-#: src/mainwindow.c:1735 src/prefs_logging.c:397
+#: src/mainwindow.c:2047 src/prefs_logging.c:394
msgid "filtering log disabled\n"
msgstr ""
-#: src/mainwindow.c:2181 src/mainwindow.c:2222 src/mainwindow.c:2252
-#: src/mainwindow.c:2284 src/mainwindow.c:2329
-#: src/plugins/trayicon/trayicon.c:138 src/prefs_folder_item.c:896
+#: src/mainwindow.c:2477 src/mainwindow.c:2484 src/mainwindow.c:2526
+#: src/mainwindow.c:2559 src/mainwindow.c:2591 src/mainwindow.c:2636
+#: src/plugins/trayicon/trayicon.c:137 src/prefs_folder_item.c:898
msgid "Untitled"
msgstr ""
-#: src/mainwindow.c:2330 src/prefs_summary_open.c:113
+#: src/mainwindow.c:2637 src/prefs_summary_open.c:113
msgid "none"
msgstr ""
-#: src/mainwindow.c:2575
+#: src/mainwindow.c:2889 src/mainwindow.c:2893
msgid "Delete all messages in trash folders?"
msgstr "Delete all messages in wastebin folders?"
-#: src/mainwindow.c:2594
+#: src/mainwindow.c:2890
+msgid "Don't quit"
+msgstr ""
+
+#: src/mainwindow.c:2919
msgid "Add mailbox"
msgstr ""
-#: src/mainwindow.c:2595
+#: src/mainwindow.c:2920
msgid ""
"Input the location of mailbox.\n"
"If an existing mailbox is specified, it will be\n"
"scanned automatically."
msgstr ""
-#: src/mainwindow.c:2601
+#: src/mainwindow.c:2926
#, c-format
msgid "The mailbox '%s' already exists."
msgstr ""
-#: src/mainwindow.c:2606 src/setup.c:51 src/wizard.c:731
+#: src/mainwindow.c:2931 src/setup.c:51 src/wizard.c:771
msgid "Mailbox"
msgstr ""
-#: src/mainwindow.c:2611 src/setup.c:54
+#: src/mainwindow.c:2936 src/setup.c:54
msgid ""
"Creation of the mailbox failed.\n"
"Maybe some files already exist, or you don't have the permission to write "
"there."
msgstr ""
-#: src/mainwindow.c:2959
+#: src/mainwindow.c:3289
msgid "No posting allowed"
msgstr ""
-#: src/mainwindow.c:3523
+#: src/mainwindow.c:3863
msgid "Mbox import has failed."
msgstr ""
-#: src/mainwindow.c:3532 src/mainwindow.c:3541
+#: src/mainwindow.c:3872 src/mainwindow.c:3881
msgid "Export to mbox has failed."
msgstr ""
-#: src/mainwindow.c:3577 src/plugins/trayicon/trayicon.c:548
+#: src/mainwindow.c:3924 src/plugins/trayicon/trayicon.c:598
msgid "Exit"
msgstr ""
-#: src/mainwindow.c:3577 src/plugins/trayicon/trayicon.c:548
+#: src/mainwindow.c:3924 src/plugins/trayicon/trayicon.c:598
msgid "Exit Claws Mail?"
msgstr ""
-#: src/mainwindow.c:3733
+#: src/mainwindow.c:4099
msgid "Folder synchronisation"
msgstr ""
-#: src/mainwindow.c:3734
+#: src/mainwindow.c:4100
msgid "Do you want to synchronise your folders now?"
msgstr ""
-#: src/mainwindow.c:3735
+#: src/mainwindow.c:4101
msgid "+_Synchronise"
msgstr ""
-#: src/mainwindow.c:4108
+#: src/mainwindow.c:4479
msgid "Deleting duplicated messages..."
msgstr ""
-#: src/mainwindow.c:4145
+#: src/mainwindow.c:4516
#, c-format
msgid "Deleted %d duplicate message in %d folders.\n"
msgid_plural "Deleted %d duplicate messages in %d folders.\n"
msgstr[0] ""
msgstr[1] ""
-#: src/mainwindow.c:4320 src/summaryview.c:5228
+#: src/mainwindow.c:4718 src/summaryview.c:5486
msgid "Processing rules to apply before folder rules"
msgstr ""
-#: src/mainwindow.c:4329
+#: src/mainwindow.c:4726
msgid "Processing rules to apply after folder rules"
msgstr ""
-#: src/mainwindow.c:4338 src/summaryview.c:5239
+#: src/mainwindow.c:4734 src/summaryview.c:5497
msgid "Filtering configuration"
msgstr ""
-#: src/matcher.c:497 src/matcher.c:502 src/matcher.c:522 src/matcher.c:527
-#: src/message_search.c:210 src/prefs_matcher.c:683 src/summary_search.c:396
+#: src/mainwindow.c:4989
+#, c-format
+msgid "Forgotten %d password in %d accounts.\n"
+msgid_plural "Forgotten %d passwords in %d accounts.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/matcher.c:498 src/matcher.c:503 src/matcher.c:523 src/matcher.c:528
+#: src/message_search.c:208 src/prefs_matcher.c:696 src/summary_search.c:392
msgid "Case sensitive"
msgstr ""
-#: src/matcher.c:497 src/matcher.c:502 src/matcher.c:522 src/matcher.c:527
+#: src/matcher.c:498 src/matcher.c:503 src/matcher.c:523 src/matcher.c:528
msgid "Case insensitive"
msgstr ""
-#: src/matcher.c:857 src/matcher.c:868 src/matcher.c:879 src/matcher.c:889
-#: src/matcher.c:890 src/matcher.c:902 src/matcher.c:903 src/matcher.c:1135
-#: src/matcher.c:1147 src/matcher.c:1159
+#: src/matcher.c:860 src/matcher.c:871 src/matcher.c:882 src/matcher.c:892
+#: src/matcher.c:893 src/matcher.c:905 src/matcher.c:906 src/matcher.c:1138
+#: src/matcher.c:1150 src/matcher.c:1162
#, c-format
msgid "%s header"
msgstr ""
-#: src/matcher.c:1248 src/matcher.c:1250
+#: src/matcher.c:1251 src/matcher.c:1253
msgid "header"
msgstr ""
-#: src/matcher.c:1259
+#: src/matcher.c:1262
msgid "header line"
msgstr ""
-#: src/matcher.c:1261
+#: src/matcher.c:1264
msgid "headers line"
msgstr ""
-#: src/matcher.c:1263 src/matcher.c:1265
+#: src/matcher.c:1266 src/matcher.c:1268
msgid "message line"
msgstr ""
-#: src/matcher.c:1276 src/matcher.c:1409 src/prefs_matcher.c:653
-#: src/prefs_matcher.c:1457 src/prefs_matcher.c:1472 src/prefs_matcher.c:2320
-msgid "Filtering Matcher Menu|All"
-msgstr ""
-
-#: src/matcher.c:1483 src/matcher.c:1486
+#: src/matcher.c:1486 src/matcher.c:1489
msgid "body line"
msgstr ""
-#: src/matcher.c:1662
+#: src/matcher.c:1665
#, c-format
msgid "checking if message matches [ %s ]\n"
msgstr ""
-#: src/matcher.c:1725 src/matcher.c:1744 src/matcher.c:1757
+#: src/matcher.c:1728 src/matcher.c:1747 src/matcher.c:1760
msgid "message matches\n"
msgstr ""
-#: src/matcher.c:1732 src/matcher.c:1750 src/matcher.c:1759
+#: src/matcher.c:1735 src/matcher.c:1753 src/matcher.c:1762
msgid "message does not match\n"
msgstr ""
-#: src/matcher.c:2016 src/matcher.c:2017 src/matcher.c:2018 src/matcher.c:2019
-#: src/matcher.c:2020 src/matcher.c:2021 src/matcher.c:2022 src/matcher.c:2023
+#: src/matcher.c:2019 src/matcher.c:2020 src/matcher.c:2021 src/matcher.c:2022
+#: src/matcher.c:2023 src/matcher.c:2024 src/matcher.c:2025 src/matcher.c:2026
msgid "(none)"
msgstr ""
@@ -7282,8 +6930,8 @@ msgstr ""
msgid "This file already exists. Do you want to overwrite it?"
msgstr ""
-#: src/mbox.c:544 src/messageview.c:1418 src/mimeview.c:1562
-#: src/textview.c:2914
+#: src/mbox.c:544 src/messageview.c:1622 src/mimeview.c:1632
+#: src/prefs_themes.c:550 src/textview.c:2938
msgid "Overwrite"
msgstr ""
@@ -7298,183 +6946,47 @@ msgstr ""
msgid "Exporting to mbox..."
msgstr ""
-#: src/message_search.c:169
+#: src/message_search.c:167
msgid "Find in current message"
msgstr ""
-#: src/message_search.c:187
+#: src/message_search.c:185
msgid "Find text:"
msgstr ""
-#: src/message_search.c:326 src/summary_search.c:667
+#: src/message_search.c:324 src/summary_search.c:663
msgid "Search failed"
msgstr ""
-#: src/message_search.c:327 src/summary_search.c:668
+#: src/message_search.c:325 src/summary_search.c:664
msgid "Search string not found."
msgstr ""
-#: src/message_search.c:336
+#: src/message_search.c:334
msgid "Beginning of message reached; continue from end?"
msgstr ""
-#: src/message_search.c:339
+#: src/message_search.c:337
msgid "End of message reached; continue from beginning?"
msgstr ""
-#: src/message_search.c:342 src/summary_search.c:679
+#: src/message_search.c:340 src/summary_search.c:675
msgid "Search finished"
msgstr ""
-#: src/messageview.c:224
-msgid "/_File/_Close"
-msgstr ""
-
-#: src/messageview.c:280
-msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-msgstr ""
-
-#: src/messageview.c:282
-msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-msgstr ""
-
-#: src/messageview.c:284
-msgid "/_View/Character _encoding/Western European (Windows-1252)"
-msgstr ""
-
-#: src/messageview.c:290
-msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-msgstr ""
-
-#: src/messageview.c:292
-msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-msgstr ""
-
-#: src/messageview.c:298
-msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-msgstr ""
-
-#: src/messageview.c:300
-msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-msgstr ""
-
-#: src/messageview.c:303
-msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
-msgstr ""
-
-#: src/messageview.c:305
-msgid "/_View/Character _encoding/Arabic (Windows-1256)"
-msgstr ""
-
-#: src/messageview.c:311
-msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-msgstr ""
-
-#: src/messageview.c:313
-msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-msgstr ""
-
-#: src/messageview.c:315
-msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-msgstr ""
-
-#: src/messageview.c:317
-msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-msgstr ""
-
-#: src/messageview.c:320
-msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-msgstr ""
-
-#: src/messageview.c:322
-msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-msgstr ""
-
-#: src/messageview.c:324
-msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-msgstr ""
-
-#: src/messageview.c:326
-msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-msgstr ""
-
-#: src/messageview.c:329
-msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-msgstr ""
-
-#: src/messageview.c:331
-msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-msgstr ""
-
-#: src/messageview.c:333
-msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-msgstr ""
-
-#: src/messageview.c:335
-msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-msgstr ""
-
-#: src/messageview.c:337
-msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-msgstr ""
-
-#: src/messageview.c:340
-msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-msgstr ""
-
-#: src/messageview.c:342
-msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-msgstr ""
-
-#: src/messageview.c:345
-msgid "/_View/Character _encoding/Thai (TIS-620)"
-msgstr ""
-
-#: src/messageview.c:347
-msgid "/_View/Character _encoding/Thai (Windows-874)"
-msgstr ""
-
-#: src/messageview.c:371
-msgid "/_View/Show all _headers"
-msgstr ""
-
-#: src/messageview.c:378
-msgid "/_Message/Compose _new message"
-msgstr ""
-
-#: src/messageview.c:392
-msgid "/_Message/Redirec_t"
+#: src/messageview.c:260 src/textview.c:214
+msgid "Compose _new message"
msgstr ""
-#: src/messageview.c:409
-msgid "/_Tools/Create processing rule"
-msgstr ""
-
-#: src/messageview.c:411
-msgid "/_Tools/Create processing rule/_Automatically"
-msgstr ""
-
-#: src/messageview.c:413
-msgid "/_Tools/Create processing rule/by _From"
-msgstr ""
-
-#: src/messageview.c:415
-msgid "/_Tools/Create processing rule/by _To"
-msgstr ""
-
-#: src/messageview.c:417
-msgid "/_Tools/Create processing rule/by _Subject"
-msgstr ""
-
-#: src/messageview.c:552 src/messageview.c:1088
+#: src/messageview.c:665 src/messageview.c:1220
msgid "Claws Mail - Message View"
msgstr ""
-#: src/messageview.c:676
+#: src/messageview.c:789
msgid "<No Return-Path found>"
msgstr ""
-#: src/messageview.c:684
+#: src/messageview.c:797
#, c-format
msgid ""
"The notification address to which the return receipt is\n"
@@ -7484,11 +6996,11 @@ msgid ""
"It is advised to not to send the return receipt."
msgstr ""
-#: src/messageview.c:691 src/messageview.c:708
+#: src/messageview.c:804 src/messageview.c:821
msgid "_Don't Send"
msgstr ""
-#: src/messageview.c:704
+#: src/messageview.c:817
msgid ""
"This message is asking for a return receipt notification\n"
"but according to its 'To:' and 'CC:' headers it was not\n"
@@ -7496,123 +7008,137 @@ msgid ""
"It is advised to not to send the return receipt."
msgstr ""
-#: src/messageview.c:1057 src/procmime.c:836
+#: src/messageview.c:1153
+#, c-format
+msgid "Fetching message (%s)..."
+msgstr ""
+
+#: src/messageview.c:1189 src/procmime.c:839
#, c-format
msgid "Couldn't decrypt: %s"
msgstr ""
-#: src/messageview.c:1410 src/messageview.c:1413 src/mimeview.c:1711
-#: src/summaryview.c:4492 src/summaryview.c:4495 src/textview.c:2902
+#: src/messageview.c:1614 src/messageview.c:1617 src/mimeview.c:1783
+#: src/summaryview.c:4750 src/summaryview.c:4753 src/textview.c:2926
msgid "Save as"
msgstr ""
-#: src/messageview.c:1419
+#: src/messageview.c:1623
msgid "Overwrite existing file?"
msgstr ""
-#: src/messageview.c:1427 src/summaryview.c:4512 src/summaryview.c:4515
-#: src/summaryview.c:4530
+#: src/messageview.c:1631 src/summaryview.c:4770 src/summaryview.c:4773
+#: src/summaryview.c:4788
#, c-format
msgid "Couldn't save the file '%s'."
msgstr ""
-#: src/messageview.c:1488
+#: src/messageview.c:1686
+#, c-format
+msgid "Show all %s."
+msgstr ""
+
+#: src/messageview.c:1688
+msgid "Only the first megabyte of text is shown."
+msgstr ""
+
+#: src/messageview.c:1719
msgid ""
-"You got a return receipt in this message : it has been displayed by the "
+"You got a return receipt for this message : it has been displayed by the "
"recipient."
msgstr ""
-#: src/messageview.c:1491
+#: src/messageview.c:1722
msgid "You asked for a return receipt in this message."
msgstr ""
-#: src/messageview.c:1497
+#: src/messageview.c:1728
msgid "This message asks for a return receipt."
msgstr ""
-#: src/messageview.c:1498
+#: src/messageview.c:1729
msgid "Send receipt"
msgstr ""
-#: src/messageview.c:1541
+#: src/messageview.c:1772
msgid ""
"This message has been partially retrieved,\n"
"and has been deleted from the server."
msgstr ""
-#: src/messageview.c:1547
+#: src/messageview.c:1778
#, c-format
msgid ""
"This message has been partially retrieved;\n"
"it is %s."
msgstr ""
-#: src/messageview.c:1551 src/messageview.c:1573
+#: src/messageview.c:1782 src/messageview.c:1804
msgid "Mark for download"
msgstr ""
-#: src/messageview.c:1552 src/messageview.c:1564
+#: src/messageview.c:1783 src/messageview.c:1795
msgid "Mark for deletion"
msgstr ""
-#: src/messageview.c:1557
+#: src/messageview.c:1788
#, c-format
msgid ""
"This message has been partially retrieved;\n"
"it is %s and will be downloaded."
msgstr ""
-#: src/messageview.c:1562 src/messageview.c:1575
-#: src/prefs_filtering_action.c:166
+#: src/messageview.c:1793 src/messageview.c:1806
+#: src/prefs_filtering_action.c:167
msgid "Unmark"
msgstr ""
-#: src/messageview.c:1568
+#: src/messageview.c:1799
#, c-format
msgid ""
"This message has been partially retrieved;\n"
"it is %s and will be deleted."
msgstr ""
-#: src/messageview.c:1641
+#: src/messageview.c:1872
msgid "Return Receipt Notification"
msgstr ""
-#: src/messageview.c:1642
+#: src/messageview.c:1873
msgid ""
"The message was sent to several of your accounts.\n"
"Please choose which account do you want to use for sending the receipt "
"notification:"
msgstr ""
-#: src/messageview.c:1646
+#: src/messageview.c:1877
msgid "_Cancel"
msgstr ""
-#: src/messageview.c:1646
+#: src/messageview.c:1877
msgid "_Send Notification"
msgstr ""
-#: src/messageview.c:1716
+#: src/messageview.c:1947
msgid "Cannot print: the message doesn't contain text."
msgstr ""
-#: src/messageview.c:1804 src/summaryview.c:4563
+#: src/messageview.c:2035 src/summaryview.c:4821
#, c-format
msgid ""
"Enter the print command line:\n"
"('%s' will be replaced with file name)"
msgstr ""
-#: src/messageview.c:1810 src/summaryview.c:4569
+#: src/messageview.c:2041 src/summaryview.c:4827
#, c-format
msgid ""
"Print command line is invalid:\n"
"'%s'"
msgstr ""
-#: src/messageview.c:2472 src/messageview.c:2478 src/summaryview.c:3886
-#: src/summaryview.c:6431
+#: src/messageview.c:2712 src/messageview.c:2718 src/summaryview.c:4142
+#: src/summaryview.c:6736
msgid "An error happened while learning.\n"
msgstr ""
@@ -7629,178 +7155,174 @@ msgstr ""
msgid "Deleting messages..."
msgstr ""
-#: src/mh_gtk.c:62
-msgid "/Remove _mailbox..."
+#: src/mh_gtk.c:60
+msgid "Remove _mailbox..."
msgstr ""
-#: src/mh_gtk.c:324
+#: src/mh_gtk.c:359
#, c-format
msgid ""
"Really remove the mailbox '%s' ?\n"
"(The messages are NOT deleted from the disk)"
msgstr ""
-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:361
msgid "Remove mailbox"
msgstr ""
-#: src/mh_gtk.c:327
-msgid "_Remove"
+#: src/mimeview.c:191
+msgid "_Open (l)"
msgstr ""
-#: src/mimeview.c:177
-msgid "/_Open (l)"
+#: src/mimeview.c:193
+msgid "Open _with (o)..."
msgstr ""
-#: src/mimeview.c:179
-msgid "/Open _with (o)..."
+#: src/mimeview.c:195
+msgid "_Display as text (t)"
msgstr ""
-#: src/mimeview.c:181
-msgid "/_Display as text (t)"
+#: src/mimeview.c:196
+msgid "_Save as (y)..."
msgstr ""
-#: src/mimeview.c:182
-msgid "/_Save as (y)..."
+#: src/mimeview.c:197
+msgid "Save _all..."
msgstr ""
-#: src/mimeview.c:183
-msgid "/Save _all..."
+#: src/mimeview.c:198
+msgid "Next part (a)"
msgstr ""
-#: src/mimeview.c:184
-msgid "/Next part (a)"
-msgstr ""
-
-#: src/mimeview.c:252
+#: src/mimeview.c:266
msgid "MIME Type"
msgstr ""
-#: src/mimeview.c:816
+#: src/mimeview.c:858
msgid "Check signature"
msgstr ""
-#: src/mimeview.c:821 src/mimeview.c:826 src/mimeview.c:831
+#: src/mimeview.c:863 src/mimeview.c:868 src/mimeview.c:873 src/mimeview.c:878
msgid "View full information"
msgstr ""
-#: src/mimeview.c:836 src/mimeview.c:840
+#: src/mimeview.c:883 src/mimeview.c:887
msgid "Check again"
msgstr ""
-#: src/mimeview.c:849
+#: src/mimeview.c:896
msgid "Click the icon or hit 'C' to check it."
msgstr ""
-#: src/mimeview.c:854
+#: src/mimeview.c:901
msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
msgstr ""
-#: src/mimeview.c:1062
+#: src/mimeview.c:1109
msgid "Checking signature..."
msgstr ""
-#: src/mimeview.c:1104
+#: src/mimeview.c:1151
msgid "Go back to email"
msgstr ""
-#: src/mimeview.c:1486 src/mimeview.c:1570 src/mimeview.c:1758
-#: src/mimeview.c:1800
+#: src/mimeview.c:1554 src/mimeview.c:1640 src/mimeview.c:1830
+#: src/mimeview.c:1872
#, c-format
msgid "Couldn't save the part of multipart message: %s"
msgstr ""
-#: src/mimeview.c:1559 src/textview.c:2912
+#: src/mimeview.c:1629 src/textview.c:2936
#, c-format
msgid "Overwrite existing file '%s'?"
msgstr ""
-#: src/mimeview.c:1600
+#: src/mimeview.c:1670
msgid "Select destination folder"
msgstr ""
-#: src/mimeview.c:1607
+#: src/mimeview.c:1677
#, c-format
msgid "'%s' is not a directory."
msgstr ""
-#: src/mimeview.c:1832
+#: src/mimeview.c:1904
msgid "No registered viewer for this file type."
msgstr ""
-#: src/mimeview.c:1864 src/mimeview.c:1871 src/textview.c:2843
+#: src/mimeview.c:1936 src/mimeview.c:1943 src/textview.c:2867
msgid "Open with"
msgstr ""
-#: src/mimeview.c:1865 src/mimeview.c:1872 src/textview.c:2844
+#: src/mimeview.c:1937 src/mimeview.c:1944 src/textview.c:2868
#, c-format
msgid ""
"Enter the command line to open file:\n"
"('%s' will be replaced with file name)"
msgstr ""
-#: src/news.c:294
+#: src/news.c:297
#, c-format
msgid "creating NNTP connection to %s:%d ...\n"
msgstr ""
-#: src/news.c:313
+#: src/news.c:316
#, c-format
msgid "Error logging in to %s:%d ...\n"
msgstr ""
-#: src/news.c:368
+#: src/news.c:372
#, c-format
msgid "Error authenticating to %s:%d ...\n"
msgstr ""
-#: src/news.c:391
+#: src/news.c:399
msgid "Claws Mail needs network access in order to access the News server."
msgstr ""
-#: src/news.c:409
+#: src/news.c:417
#, c-format
msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
msgstr ""
-#: src/news.c:769
+#: src/news.c:777
#, c-format
msgid "couldn't select group: %s\n"
msgstr ""
-#: src/news.c:965
+#: src/news.c:976
#, c-format
msgid "couldn't set group: %s\n"
msgstr ""
-#: src/news.c:974
+#: src/news.c:985
#, c-format
msgid "invalid article range: %d - %d\n"
msgstr ""
-#: src/news.c:1025
+#: src/news.c:1036
#, c-format
msgid "getting xover %d in %s...\n"
msgstr ""
-#: src/news.c:1031 src/news.c:1110
+#: src/news.c:1042 src/news.c:1121
msgid "couldn't get xover\n"
msgstr ""
-#: src/news.c:1043 src/news.c:1124
+#: src/news.c:1054 src/news.c:1135
msgid "invalid xover line\n"
msgstr ""
-#: src/news.c:1060 src/news.c:1075
+#: src/news.c:1071 src/news.c:1086
msgid "couldn't get xhdr\n"
msgstr ""
-#: src/news.c:1102
+#: src/news.c:1113
#, c-format
msgid "getting xover %d - %d in %s...\n"
msgstr ""
-#: src/news.c:1250
+#: src/news.c:1281
msgid ""
"You have one or more News accounts defined. However this version of Claws "
"Mail has been built without News support; your News account(s) are "
@@ -7809,45 +7331,45 @@ msgid ""
"You probably need to install libetpan and recompile Claws Mail."
msgstr ""
-#: src/news_gtk.c:53
-msgid "/_Subscribe to newsgroup..."
-msgstr ""
-
-#: src/news_gtk.c:54
-msgid "/_Unsubscribe newsgroup"
+#: src/news_gtk.c:55
+msgid "_Subscribe to newsgroup..."
msgstr ""
#: src/news_gtk.c:56
-msgid "/Synchronise"
+msgid "_Unsubscribe newsgroup"
msgstr ""
-#: src/news_gtk.c:227
+#: src/news_gtk.c:250
#, c-format
msgid "Really unsubscribe newsgroup '%s'?"
msgstr ""
-#: src/news_gtk.c:228
+#: src/news_gtk.c:251
msgid "Unsubscribe newsgroup"
msgstr ""
-#: src/news_gtk.c:229
+#: src/news_gtk.c:252
msgid "_Unsubscribe"
msgstr ""
+#: src/news_gtk.c:306
+msgid "Rename newsgroup folder"
+msgstr ""
+
#: src/plugins/bogofilter/bogofilter.c:77
-#: src/plugins/bogofilter/bogofilter_gtk.c:430
+#: src/plugins/bogofilter/bogofilter_gtk.c:451
msgid "Bogofilter"
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:466
+#: src/plugins/bogofilter/bogofilter.c:470
msgid "Bogofilter: fetching bodies..."
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:479
+#: src/plugins/bogofilter/bogofilter.c:483
msgid "Bogofilter: filtering messages..."
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:573
+#: src/plugins/bogofilter/bogofilter.c:598
msgid ""
"The Bogofilter plugin couldn't filter a message. The probable cause of the "
"error is that it didn't learn from any mail.\n"
@@ -7855,39 +7377,39 @@ msgid ""
"with a few hundred spam and ham messages."
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:580
+#: src/plugins/bogofilter/bogofilter.c:605
#, c-format
msgid ""
"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
"couldn't be run."
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:726
+#: src/plugins/bogofilter/bogofilter.c:751
msgid "Bogofilter: learning from message..."
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:739
-#: src/plugins/bogofilter/bogofilter.c:788
+#: src/plugins/bogofilter/bogofilter.c:764
+#: src/plugins/bogofilter/bogofilter.c:813
#, c-format
msgid "Learning failed; `%s` returned with status %d."
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:781
msgid "Bogofilter: learning from messages..."
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:844
+#: src/plugins/bogofilter/bogofilter.c:869
#, c-format
msgid ""
"Learning failed; `%s %s %s` returned with error:\n"
"%s"
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:846 src/privacy.c:61
+#: src/plugins/bogofilter/bogofilter.c:871 src/privacy.c:61
msgid "Unknown error"
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:973
+#: src/plugins/bogofilter/bogofilter.c:998
msgid ""
"This plugin can check all messages that are received from an IMAP, LOCAL or "
"POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -7903,178 +7425,121 @@ msgid ""
"Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:1006
+#: src/plugins/bogofilter/bogofilter.c:1031
#: src/plugins/spamassassin/spamassassin.c:649
msgid "Spam detection"
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:1007
+#: src/plugins/bogofilter/bogofilter.c:1032
#: src/plugins/spamassassin/spamassassin.c:650
msgid "Spam learning"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:149
-#: src/plugins/spamassassin/spamassassin_gtk.c:404
+#: src/plugins/bogofilter/bogofilter_gtk.c:148
+#: src/plugins/spamassassin/spamassassin_gtk.c:398
msgid "Process messages on receiving"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:157
-#: src/plugins/spamassassin/spamassassin_gtk.c:361
+#: src/plugins/bogofilter/bogofilter_gtk.c:156
+#: src/plugins/spamassassin/spamassassin_gtk.c:356
msgid "Maximum size"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:166
-#: src/plugins/spamassassin/spamassassin_gtk.c:370
+#: src/plugins/bogofilter/bogofilter_gtk.c:165
+#: src/plugins/spamassassin/spamassassin_gtk.c:365
msgid "Messages larger than this will not be checked"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:169
-#: src/plugins/spamassassin/spamassassin_gtk.c:373 src/prefs_account.c:1410
+#: src/plugins/bogofilter/bogofilter_gtk.c:168
+#: src/plugins/spamassassin/spamassassin_gtk.c:368 src/prefs_account.c:1463
msgid "KB"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:177
-#: src/plugins/spamassassin/spamassassin_gtk.c:412
+#: src/plugins/bogofilter/bogofilter_gtk.c:176
+#: src/plugins/spamassassin/spamassassin_gtk.c:406
msgid "Save spam in"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:420
+#: src/plugins/bogofilter/bogofilter_gtk.c:184
+#: src/plugins/spamassassin/spamassassin_gtk.c:414
msgid ""
"Folder for storing identified spam. Leave empty to use the trash folder."
msgstr ""
"Folder for storing identified spam. Leave empty to use the wastebin folder."
-#: src/plugins/bogofilter/bogofilter_gtk.c:192
-#: src/plugins/spamassassin/spamassassin_gtk.c:427
+#: src/plugins/bogofilter/bogofilter_gtk.c:190
+#: src/plugins/spamassassin/spamassassin_gtk.c:420
msgid "Click this button to select a folder for storing spam"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:199
+#: src/plugins/bogofilter/bogofilter_gtk.c:196
msgid "When unsure, move to"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:204
msgid ""
"Folder for storing mail for which spam status is Unsure. Leave empty to use "
-"the Inbox folder."
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
-msgid "Click this button to select a folder for storing Unsure mails."
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:217
-msgid "Insert X-Bogosity header"
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:221
-msgid "Only done for messages in MH folders"
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:228
-#: src/plugins/spamassassin/spamassassin_gtk.c:443
-msgid "Whitelist senders found in address book/folder"
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-msgid ""
-"Messages coming from your address book contacts will be received in the "
-"normal folder even if detected as spam"
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:238
-#: src/plugins/dillo_viewer/dillo_prefs.c:203
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
-#: src/prefs_filtering_action.c:525 src/prefs_filtering_action.c:531
-#: src/prefs_matcher.c:627
-msgid "Select ..."
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
-#: src/plugins/spamassassin/spamassassin_gtk.c:457
-msgid "Click this button to select a book or folder in the address book"
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:249
-msgid "Bogofilter call"
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:257
-msgid "Path to bogofilter executable"
-msgstr ""
-
-#: src/plugins/bogofilter/bogofilter_gtk.c:264
-#: src/plugins/spamassassin/spamassassin_gtk.c:435
-msgid "Mark spam as read"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:49
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:140
-msgid "ClamAV: scanning message..."
+"the Inbox folder."
msgstr ""
-#: src/plugins/clamav/clamav_plugin.c:240
-msgid "Failed to register mail filtering hook"
+#: src/plugins/bogofilter/bogofilter_gtk.c:210
+msgid "Click this button to select a folder for storing Unsure mails."
msgstr ""
-#: src/plugins/clamav/clamav_plugin.c:306
-msgid ""
-"This plugin uses Clam AntiVirus to scan all messages that are received from "
-"an IMAP, LOCAL or POP account.\n"
-"\n"
-"When a message attachment is found to contain a virus it can be deleted or "
-"saved in a specially designated folder.\n"
-"\n"
-"Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
+#: src/plugins/bogofilter/bogofilter_gtk.c:212
+msgid "Insert X-Bogosity header"
msgstr ""
-#: src/plugins/clamav/clamav_plugin.c:333
-msgid "Virus detection"
+#: src/plugins/bogofilter/bogofilter_gtk.c:216
+msgid "Only done for messages in MH folders"
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:96
-msgid "Enable virus scanning"
+#: src/plugins/bogofilter/bogofilter_gtk.c:222
+#: src/plugins/spamassassin/spamassassin_gtk.c:435
+msgid "Whitelist senders found in address book/folder"
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:97
-msgid "Scan archive contents"
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
+#: src/plugins/spamassassin/spamassassin_gtk.c:439
+msgid ""
+"Messages coming from your address book contacts will be received in the "
+"normal folder even if detected as spam"
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:106
-msgid "Maximum attachment size"
+#: src/plugins/bogofilter/bogofilter_gtk.c:232
+#: src/plugins/dillo_viewer/dillo_prefs.c:200
+#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/prefs_filtering_action.c:533 src/prefs_filtering_action.c:539
+#: src/prefs_matcher.c:640
+msgid "Select ..."
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:117
-msgid "Message attachments larger than this will not be scanned"
+#: src/plugins/bogofilter/bogofilter_gtk.c:236
+#: src/plugins/spamassassin/spamassassin_gtk.c:449
+msgid "Click this button to select a book or folder in the address book"
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:121
-msgid "MB"
+#: src/plugins/bogofilter/bogofilter_gtk.c:238
+msgid "Learn whitelisted emails as ham"
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:130
-msgid "Save infected mail in"
+#: src/plugins/bogofilter/bogofilter_gtk.c:240
+msgid ""
+"If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
+"learn it as ham."
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:134
-msgid "Save mail that contains viruses"
+#: src/plugins/bogofilter/bogofilter_gtk.c:249
+msgid "Bogofilter call"
msgstr ""
-#: src/plugins/clamav/clamav_plugin_gtk.c:142
-msgid ""
-"Folder for storing infected mail. Leave empty to use the default trash folder"
+#: src/plugins/bogofilter/bogofilter_gtk.c:257
+msgid "Path to bogofilter executable"
msgstr ""
-"Folder for storing infected mail. Leave empty to use the default wastebin "
-"folder"
-#: src/plugins/clamav/clamav_plugin_gtk.c:150
-msgid "Click this button to select a folder for storing infected mail"
+#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
+msgid "Mark spam as read"
msgstr ""
#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
@@ -8097,27 +7562,27 @@ msgstr ""
msgid "Dillo Browser"
msgstr ""
-#: src/plugins/dillo_viewer/dillo_prefs.c:170
+#: src/plugins/dillo_viewer/dillo_prefs.c:167
msgid "Load remote links in mails"
msgstr ""
-#: src/plugins/dillo_viewer/dillo_prefs.c:176
+#: src/plugins/dillo_viewer/dillo_prefs.c:173
msgid "Equivalent to Dillo's '--local' option"
msgstr ""
-#: src/plugins/dillo_viewer/dillo_prefs.c:178
+#: src/plugins/dillo_viewer/dillo_prefs.c:175
msgid "You can still load remote links by reloading the page"
msgstr ""
-#: src/plugins/dillo_viewer/dillo_prefs.c:195
+#: src/plugins/dillo_viewer/dillo_prefs.c:192
msgid "Only for senders found in address book/folder"
msgstr ""
-#: src/plugins/dillo_viewer/dillo_prefs.c:214
+#: src/plugins/dillo_viewer/dillo_prefs.c:221
msgid "Full window mode (hide controls)"
msgstr ""
-#: src/plugins/dillo_viewer/dillo_prefs.c:220
+#: src/plugins/dillo_viewer/dillo_prefs.c:227
msgid "Equivalent to Dillo's '--fullwindow' option"
msgstr ""
@@ -8136,15 +7601,15 @@ msgid ""
"Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106
+#: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:104
msgid "Passphrase"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:252
msgid "[no user id]"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:278
+#: src/plugins/pgpcore/passphrase.c:267
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
@@ -8153,11 +7618,11 @@ msgid ""
"%.*s\n"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:281
+#: src/plugins/pgpcore/passphrase.c:270
msgid "Passphrases did not match.\n"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:284
+#: src/plugins/pgpcore/passphrase.c:273
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
@@ -8166,7 +7631,7 @@ msgid ""
"%.*s\n"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:288
+#: src/plugins/pgpcore/passphrase.c:277
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
@@ -8175,7 +7640,7 @@ msgid ""
"%.*s\n"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:291
+#: src/plugins/pgpcore/passphrase.c:280
msgid "Bad passphrase.\n"
msgstr ""
@@ -8266,114 +7731,114 @@ msgstr ""
msgid "Core operations"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:104
+#: src/plugins/pgpcore/prefs_gpg.c:102
msgid "Automatically check signatures"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:109
+#: src/plugins/pgpcore/prefs_gpg.c:107
msgid "Use gpg-agent to manage passwords"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:114
+#: src/plugins/pgpcore/prefs_gpg.c:112
msgid "Store passphrase in memory"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:124
+#: src/plugins/pgpcore/prefs_gpg.c:122
msgid "Expire after"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:139
+#: src/plugins/pgpcore/prefs_gpg.c:137
msgid "Setting to '0' will store the passphrase for the whole session"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:172
+#: src/plugins/pgpcore/prefs_gpg.c:141 src/prefs_receive.c:172
msgid "minute(s)"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:154
+#: src/plugins/pgpcore/prefs_gpg.c:151
msgid "Grab input while entering a passphrase"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:161
+#: src/plugins/pgpcore/prefs_gpg.c:158
msgid "Display warning on start-up if GnuPG doesn't work"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:295
+#: src/plugins/pgpcore/prefs_gpg.c:292
msgid "Sign key"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:303
+#: src/plugins/pgpcore/prefs_gpg.c:300
msgid "Use default GnuPG key"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:314
+#: src/plugins/pgpcore/prefs_gpg.c:311
msgid "Select key by your email address"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:325
+#: src/plugins/pgpcore/prefs_gpg.c:322
msgid "Specify key manually"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:335
+#: src/plugins/pgpcore/prefs_gpg.c:332
msgid "User or key ID:"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:376
+#: src/plugins/pgpcore/prefs_gpg.c:373
msgid "No secret key found."
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:379
+#: src/plugins/pgpcore/prefs_gpg.c:376
msgid "Generate a new key pair"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:557
+#: src/plugins/pgpcore/prefs_gpg.c:554
msgid "GPG"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:107
+#: src/plugins/pgpcore/select-keys.c:95
#, c-format
msgid "No exact match for '%s'; please select the key."
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:110
+#: src/plugins/pgpcore/select-keys.c:98
#, c-format
msgid "Collecting info for '%s' ... %c"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:379
+#: src/plugins/pgpcore/select-keys.c:367
msgid "Select Keys"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:406
+#: src/plugins/pgpcore/select-keys.c:394
msgid "Key ID"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:409
+#: src/plugins/pgpcore/select-keys.c:397
msgid "Val"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:430
+#: src/plugins/pgpcore/select-keys.c:418
msgid "Select"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:431 src/prefs_logging.c:428
-#: src/prefs_msg_colors.c:145 src/prefs_other.c:682
+#: src/plugins/pgpcore/select-keys.c:419 src/prefs_logging.c:427
+#: src/prefs_msg_colors.c:145 src/prefs_other.c:709
msgid "Other"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:432
+#: src/plugins/pgpcore/select-keys.c:420
msgid "Don't encrypt"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:574
+#: src/plugins/pgpcore/select-keys.c:562
msgid "Add key"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:575
+#: src/plugins/pgpcore/select-keys.c:563
msgid "Enter another user or key ID:"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:597
+#: src/plugins/pgpcore/select-keys.c:585
#, c-format
msgid ""
"The key of '%s' is not fully trusted.\n"
@@ -8382,195 +7847,201 @@ msgid ""
"Do you trust it enough to use it anyway?"
msgstr ""
-#: src/plugins/pgpcore/select-keys.c:602
+#: src/plugins/pgpcore/select-keys.c:590
msgid "Trust key"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:211 src/privacy.c:215
-#: src/privacy.c:232 src/privacy.c:236
+#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:233 src/privacy.c:237
+#: src/privacy.c:254 src/privacy.c:258
msgid "No signature found"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:144
msgid "Undefined"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:144 src/prefs_receive.c:196
+#: src/plugins/pgpcore/sgpgme.c:146 src/prefs_receive.c:196
+#: src/prefs_summaries.c:462
msgid "Never"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/sgpgme.c:148
msgid "Marginal"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:152
msgid "Ultimate"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:184
+#: src/plugins/pgpcore/sgpgme.c:186
#, c-format
msgid "The signature can't be checked - %s"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:188 src/plugins/pgpcore/sgpgme.c:192
-#: src/plugins/pgpcore/sgpgme.c:239
+#: src/plugins/pgpcore/sgpgme.c:190 src/plugins/pgpcore/sgpgme.c:194
+#: src/plugins/pgpcore/sgpgme.c:241
msgid "The signature has not been checked."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:198 src/plugins/pgpcore/sgpgme.c:200
+#: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:202
msgid "PGP Core: Can't get key - no gpg-agent running."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:213
+#: src/plugins/pgpcore/sgpgme.c:215
#, c-format
msgid "Good signature from %s."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:221
#, c-format
msgid "Good signature (untrusted) from %s."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:224
+#: src/plugins/pgpcore/sgpgme.c:226
#, c-format
msgid "Expired signature from %s."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:227
+#: src/plugins/pgpcore/sgpgme.c:229
#, c-format
msgid "Expired key from %s."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:230
+#: src/plugins/pgpcore/sgpgme.c:232
#, c-format
msgid "Bad signature from %s."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:234
+#: src/plugins/pgpcore/sgpgme.c:236
#, c-format
msgid "Key 0x%s not available to verify this signature."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:269
+#, c-format
+msgid "Error checking signature: %s\n"
+msgstr ""
+
+#: src/plugins/pgpcore/sgpgme.c:285
#, c-format
msgid "Signature made using %s key ID %s\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:283
+#: src/plugins/pgpcore/sgpgme.c:292
#, c-format
msgid "Good signature from \"%s\" (Trust: %s)\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:288
+#: src/plugins/pgpcore/sgpgme.c:297
#, c-format
msgid "Expired signature from \"%s\"\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:293
+#: src/plugins/pgpcore/sgpgme.c:302
#, c-format
msgid "BAD signature from \"%s\"\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:304
+#: src/plugins/pgpcore/sgpgme.c:313
#, c-format
msgid " aka \"%s\"\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:310
+#: src/plugins/pgpcore/sgpgme.c:319
#, c-format
msgid "Primary key fingerprint: %s\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:315
+#: src/plugins/pgpcore/sgpgme.c:324
#, c-format
msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:321
+#: src/plugins/pgpcore/sgpgme.c:330
#, c-format
msgid "Verified signer's address is \"%s\"\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:363
+#: src/plugins/pgpcore/sgpgme.c:372
#, c-format
msgid "Couldn't get data from message, %s"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:379
+#: src/plugins/pgpcore/sgpgme.c:388
#, c-format
msgid "Couldn't initialize data, %s"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:498
+#: src/plugins/pgpcore/sgpgme.c:507
#, c-format
msgid "Secret key not found (%s)"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:506
+#: src/plugins/pgpcore/sgpgme.c:515
msgid "Secret key specification is ambiguous"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:525
#, c-format
msgid "Error setting secret key: %s"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:552
+#: src/plugins/pgpcore/sgpgme.c:563
#, c-format
msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:558
+#: src/plugins/pgpcore/sgpgme.c:569
#, c-format
msgid ""
"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
"version %s is required.\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:566
+#: src/plugins/pgpcore/sgpgme.c:577
#, c-format
msgid "Gpgme protocol '%s' is unusable (unknown problem)"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:582
+#: src/plugins/pgpcore/sgpgme.c:593
msgid ""
"GnuPG is not installed properly, or needs to be upgraded.\n"
"OpenPGP support disabled."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:616
+#: src/plugins/pgpcore/sgpgme.c:627
msgid ""
"You have to save the account's information with \"OK\" before being able to "
"generate a key pair.\n"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:621
+#: src/plugins/pgpcore/sgpgme.c:632
msgid "No PGP key found"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:622
+#: src/plugins/pgpcore/sgpgme.c:633
msgid ""
"Claws Mail did not find a secret PGP key, which means that you won't be able "
"to sign emails or receive encrypted emails.\n"
"Do you want to create a new key pair now?"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:692 src/plugins/pgpcore/sgpgme.c:708
+#: src/plugins/pgpcore/sgpgme.c:703 src/plugins/pgpcore/sgpgme.c:719
#, c-format
msgid "Couldn't generate a new key pair: %s"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:699
+#: src/plugins/pgpcore/sgpgme.c:710
msgid ""
"Generating your new key pair... Please move the mouse around to help "
"generate entropy..."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:714
+#: src/plugins/pgpcore/sgpgme.c:725
msgid "Couldn't generate a new key pair: unknown error"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:718
+#: src/plugins/pgpcore/sgpgme.c:729
#, c-format
msgid ""
"Your new key pair has been generated. Its fingerprint is:\n"
@@ -8579,19 +8050,19 @@ msgid ""
"Do you want to export it to a keyserver?"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:722
+#: src/plugins/pgpcore/sgpgme.c:733
msgid "Key generated"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:761
+#: src/plugins/pgpcore/sgpgme.c:772
msgid "Key exported."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:763
+#: src/plugins/pgpcore/sgpgme.c:774
msgid "Couldn't export key."
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:767
+#: src/plugins/pgpcore/sgpgme.c:778
msgid "Key export isn't implemented in Windows."
msgstr ""
@@ -8615,7 +8086,7 @@ msgstr ""
#: src/plugins/pgpinline/pgpinline.c:752 src/plugins/pgpinline/pgpinline.c:799
#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:493
-#: src/plugins/pgpmime/pgpmime.c:636
+#: src/plugins/pgpmime/pgpmime.c:636 src/plugins/smime/smime.c:402
#, c-format
msgid "Couldn't initialize GPG context, %s"
msgstr ""
@@ -8732,11 +8203,11 @@ msgstr ""
msgid "Signature boundary not found."
msgstr ""
-#: src/plugins/pgpmime/pgpmime.c:387
+#: src/plugins/pgpmime/pgpmime.c:387 src/plugins/smime/smime.c:481
msgid "Couldn't parse decrypted file."
msgstr ""
-#: src/plugins/pgpmime/pgpmime.c:393
+#: src/plugins/pgpmime/pgpmime.c:393 src/plugins/smime/smime.c:488
msgid "Couldn't parse decrypted file parts."
msgstr ""
@@ -8773,8 +8244,56 @@ msgid ""
"GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
msgstr ""
+#: src/plugins/smime/plugin.c:37 src/plugins/smime/plugin.c:53
+#: src/plugins/smime/smime.c:911
+msgid "S/MIME"
+msgstr ""
+
+#: src/plugins/smime/plugin.c:58
+msgid ""
+"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
+"mails, verify signatures or sign and encrypt your own mails.\n"
+"\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account "
+"Preferences]/Privacy and when composing a message from /Options/Privacy "
+"System\n"
+"\n"
+"This plugin uses the GPGME library as a wrapper for GnuPG.\n"
+"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and "
+"configured.\n"
+"\n"
+"Information about how to get S/MIME certificates working with GPGSM can be "
+"found at:\n"
+"http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
+"\n"
+"GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
+msgstr ""
+
+#: src/plugins/smime/smime.c:410
+#, c-format
+msgid "Couldn't set GPG protocol, %s"
+msgstr ""
+
+#: src/plugins/smime/smime.c:438
+msgid "Couldn't open temporary file"
+msgstr ""
+
+#: src/plugins/smime/smime.c:448 src/plugins/smime/smime.c:462
+msgid "Couldn't write to temporary file"
+msgstr ""
+
+#: src/plugins/smime/smime.c:473
+msgid "Couldn't close temporary file"
+msgstr ""
+
+#: src/plugins/smime/smime.c:687
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the S/"
+"MIME system."
+msgstr ""
+
#: src/plugins/spamassassin/spamassassin.c:76
-#: src/plugins/spamassassin/spamassassin_gtk.c:635
+#: src/plugins/spamassassin/spamassassin_gtk.c:642
msgid "SpamAssassin"
msgstr ""
@@ -8841,50 +8360,50 @@ msgstr ""
msgid "Unix Socket"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:270
+#: src/plugins/spamassassin/spamassassin_gtk.c:267
msgid "Enable SpamAssassin plugin"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:271
msgid "Transport"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:279
msgid "Type of transport"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:303
+#: src/plugins/spamassassin/spamassassin_gtk.c:300
msgid "User"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:316
+#: src/plugins/spamassassin/spamassassin_gtk.c:313
msgid "User to use with spamd server"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:319
+#: src/plugins/spamassassin/spamassassin_gtk.c:315
msgid "spamd"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:337
+#: src/plugins/spamassassin/spamassassin_gtk.c:333
msgid "Hostname or IP address of spamd server"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:348
+#: src/plugins/spamassassin/spamassassin_gtk.c:344
msgid "Port of spamd server"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:354
+#: src/plugins/spamassassin/spamassassin_gtk.c:350
msgid "Path of Unix socket"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:390
+#: src/plugins/spamassassin/spamassassin_gtk.c:385
msgid ""
"Maximum time allowed for checking. If the check takes longer it will be "
"aborted."
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:395 src/prefs_other.c:575
-#: src/prefs_summaries.c:489
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_other.c:580
+#: src/prefs_summaries.c:496
msgid "seconds"
msgstr ""
@@ -8896,65 +8415,61 @@ msgstr ""
msgid "The orientation of the tray."
msgstr ""
-#: src/plugins/trayicon/trayicon.c:52 src/plugins/trayicon/trayicon.c:571
+#: src/plugins/trayicon/trayicon.c:52 src/plugins/trayicon/trayicon.c:621
#: src/plugins/trayicon/trayicon_prefs.c:69
msgid "Trayicon"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:101
-msgid "/_Get Mail"
+#: src/plugins/trayicon/trayicon.c:105
+msgid "_Get Mail"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:103
-msgid "/_Email"
+#: src/plugins/trayicon/trayicon.c:107
+msgid "_Email"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:104
-msgid "/_Email from account"
+#: src/plugins/trayicon/trayicon.c:108
+msgid "E_mail from account"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:106
-msgid "/Open A_ddressbook"
+#: src/plugins/trayicon/trayicon.c:109
+msgid "Open A_ddressbook"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:108
-msgid "/_Work Offline"
+#: src/plugins/trayicon/trayicon.c:110
+msgid "E_xit Claws Mail"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:110
-msgid "/E_xit Claws Mail"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "_Work Offline"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:199
+#: src/plugins/trayicon/trayicon.c:203
#, c-format
msgid "New %d, Unread: %d, Total: %d"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:395
-msgid "Failed to register folder item update hook"
-msgstr ""
-
-#: src/plugins/trayicon/trayicon.c:401
-msgid "Failed to register folder update hook"
-msgstr ""
-
-#: src/plugins/trayicon/trayicon.c:407
+#: src/plugins/trayicon/trayicon.c:448
msgid "Failed to register offline switch hook"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:413
+#: src/plugins/trayicon/trayicon.c:454
msgid "Failed to register account list changed hook"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:419
+#: src/plugins/trayicon/trayicon.c:460
msgid "Failed to register close hook"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:425
+#: src/plugins/trayicon/trayicon.c:466
msgid "Failed to register got iconified hook"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:489
+#: src/plugins/trayicon/trayicon.c:472
+msgid "Failed to register theme change hook"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon.c:539
msgid ""
"This plugin places a mailbox icon in the system tray that indicates if you "
"have new or unread mail.\n"
@@ -8963,29 +8478,29 @@ msgid ""
"letter. A tooltip shows new, unread and total number of messages."
msgstr ""
-#: src/plugins/trayicon/trayicon_prefs.c:110
+#: src/plugins/trayicon/trayicon_prefs.c:107
msgid "Hide at start-up"
msgstr ""
-#: src/plugins/trayicon/trayicon_prefs.c:116
+#: src/plugins/trayicon/trayicon_prefs.c:113
msgid "Hide Claws Mail at start-up"
msgstr ""
-#: src/plugins/trayicon/trayicon_prefs.c:120
+#: src/plugins/trayicon/trayicon_prefs.c:116
msgid "Close to tray"
msgstr ""
-#: src/plugins/trayicon/trayicon_prefs.c:126
+#: src/plugins/trayicon/trayicon_prefs.c:122
msgid ""
"Hide Claws Mail using the tray icon instead of closing it\n"
"when the window close button is clicked"
msgstr ""
-#: src/plugins/trayicon/trayicon_prefs.c:130
+#: src/plugins/trayicon/trayicon_prefs.c:125
msgid "Minimize to tray"
msgstr ""
-#: src/plugins/trayicon/trayicon_prefs.c:136
+#: src/plugins/trayicon/trayicon_prefs.c:131
msgid "Hide Claws Mail using the tray icon instead of minimizing it"
msgstr ""
@@ -9010,601 +8525,644 @@ msgstr ""
msgid "invalid UIDL response: %s\n"
msgstr ""
-#: src/pop.c:827
+#: src/pop.c:828
#, c-format
msgid "POP3: Deleting expired message %d [%s]\n"
msgstr ""
-#: src/pop.c:843
+#: src/pop.c:844
#, c-format
msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
msgstr ""
-#: src/pop.c:875
+#: src/pop.c:876
msgid "mailbox is locked\n"
msgstr ""
-#: src/pop.c:878
+#: src/pop.c:879
msgid "Session timeout\n"
msgstr ""
-#: src/pop.c:897
+#: src/pop.c:898
msgid "command not supported\n"
msgstr ""
-#: src/pop.c:902
+#: src/pop.c:903
msgid "error occurred on POP3 session\n"
msgstr ""
-#: src/pop.c:1096
+#: src/pop.c:1098
msgid "TOP command unsupported\n"
msgstr ""
-#: src/prefs_account.c:306 src/prefs_account.c:1360 src/prefs_account.c:2268
-#: src/wizard.c:1394
+#: src/prefs_account.c:322 src/prefs_account.c:1406 src/prefs_account.c:2328
+#: src/wizard.c:1506
msgid "POP3"
msgstr ""
-#: src/prefs_account.c:309 src/prefs_account.c:1470 src/prefs_account.c:2281
+#: src/prefs_account.c:325 src/prefs_account.c:1519 src/prefs_account.c:2341
msgid "IMAP4"
msgstr ""
-#: src/prefs_account.c:310
+#: src/prefs_account.c:326
msgid "News (NNTP)"
msgstr ""
-#: src/prefs_account.c:311 src/wizard.c:1396
+#: src/prefs_account.c:327 src/wizard.c:1508
msgid "Local mbox file"
msgstr ""
-#: src/prefs_account.c:312
+#: src/prefs_account.c:328
msgid "None (SMTP only)"
msgstr ""
-#: src/prefs_account.c:949
+#: src/prefs_account.c:1004
msgid "Name of account"
msgstr ""
-#: src/prefs_account.c:958
+#: src/prefs_account.c:1013
msgid "Set as default"
msgstr ""
-#: src/prefs_account.c:966
+#: src/prefs_account.c:1021
msgid "Personal information"
msgstr ""
-#: src/prefs_account.c:975
+#: src/prefs_account.c:1030
msgid "Full name"
msgstr ""
-#: src/prefs_account.c:981
+#: src/prefs_account.c:1036
msgid "Mail address"
msgstr ""
-#: src/prefs_account.c:1011
+#: src/prefs_account.c:1066
msgid "Server information"
msgstr ""
-#: src/prefs_account.c:1046
+#: src/prefs_account.c:1101
msgid ""
"<span weight=\"bold\">Warning: this version of Claws Mail\n"
"has been built without IMAP and News support.</span>"
msgstr ""
-#: src/prefs_account.c:1075
+#: src/prefs_account.c:1130
msgid "This server requires authentication"
msgstr ""
-#: src/prefs_account.c:1082
+#: src/prefs_account.c:1137
msgid "Authenticate on connect"
msgstr ""
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1195
msgid "News server"
msgstr ""
-#: src/prefs_account.c:1146
+#: src/prefs_account.c:1201
msgid "Server for receiving"
msgstr ""
-#: src/prefs_account.c:1152
+#: src/prefs_account.c:1207
msgid "Local mailbox"
msgstr ""
-#: src/prefs_account.c:1159
+#: src/prefs_account.c:1214
msgid "SMTP server (send)"
msgstr ""
-#: src/prefs_account.c:1167
+#: src/prefs_account.c:1222
msgid "Use mail command rather than SMTP server"
msgstr ""
-#: src/prefs_account.c:1176
+#: src/prefs_account.c:1231
msgid "command to send mails"
msgstr ""
-#: src/prefs_account.c:1183 src/prefs_account.c:1683
+#: src/prefs_account.c:1238 src/prefs_account.c:1732
msgid "User ID"
msgstr ""
-#: src/prefs_account.c:1189 src/prefs_account.c:1703
+#: src/prefs_account.c:1244 src/prefs_account.c:1752 src/prefs_account.c:2403
+#: src/prefs_account.c:2425 src/wizard.c:1354 src/wizard.c:1617
msgid "Password"
msgstr ""
-#: src/prefs_account.c:1239
+#: src/prefs_account.c:1293
#, c-format
msgid "Account%d"
msgstr ""
-#: src/prefs_account.c:1332
+#: src/prefs_account.c:1380
msgid "Local"
msgstr ""
-#: src/prefs_account.c:1338 src/prefs_account.c:1422
+#: src/prefs_account.c:1386 src/prefs_account.c:1475
msgid "Default Inbox"
msgstr ""
-#: src/prefs_account.c:1345 src/prefs_account.c:1353 src/prefs_account.c:1429
-#: src/prefs_account.c:1437
+#: src/prefs_account.c:1393 src/prefs_account.c:1400 src/prefs_account.c:1482
+#: src/prefs_account.c:1489
msgid "Unfiltered messages will be stored in this folder"
msgstr ""
-#: src/prefs_account.c:1350 src/prefs_account.c:1434 src/prefs_account.c:1885
+#: src/prefs_account.c:1397 src/prefs_account.c:1486 src/prefs_account.c:1934
msgid "Bro_wse"
msgstr ""
-#: src/prefs_account.c:1362
+#: src/prefs_account.c:1408
msgid "Use secure authentication (APOP)"
msgstr ""
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1411
msgid "Remove messages on server when received"
msgstr ""
-#: src/prefs_account.c:1376
+#: src/prefs_account.c:1422
msgid "Remove after"
msgstr ""
-#: src/prefs_account.c:1385
-msgid "0 days: remove immediately"
+#: src/prefs_account.c:1429 src/prefs_account.c:1439
+msgid "0 days and 0 hours : remove immediately"
msgstr ""
-#: src/prefs_account.c:1388 src/prefs_folder_item.c:507
-#: src/prefs_matcher.c:312
+#: src/prefs_account.c:1432 src/prefs_folder_item.c:509
+#: src/prefs_matcher.c:314
msgid "days"
msgstr ""
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1442
+msgid "hours"
+msgstr ""
+
+#: src/prefs_account.c:1452
msgid "Receive size limit"
msgstr ""
-#: src/prefs_account.c:1401
+#: src/prefs_account.c:1455
msgid ""
"Messages over this limit will be partially retrieved. When selecting them "
"you will be able to download them fully or delete them."
msgstr ""
-#: src/prefs_account.c:1444 src/prefs_account.c:2294
+#: src/prefs_account.c:1495 src/prefs_account.c:2354
msgid "NNTP"
msgstr ""
-#: src/prefs_account.c:1451
+#: src/prefs_account.c:1502
msgid "Maximum number of articles to download"
msgstr ""
-#: src/prefs_account.c:1463
+#: src/prefs_account.c:1512
msgid "unlimited if 0 is specified"
msgstr ""
-#: src/prefs_account.c:1476 src/prefs_account.c:1656
+#: src/prefs_account.c:1525 src/prefs_account.c:1705
msgid "Authentication method"
msgstr ""
-#: src/prefs_account.c:1486 src/prefs_account.c:1665 src/prefs_send.c:292
+#: src/prefs_account.c:1535 src/prefs_account.c:1714 src/prefs_send.c:285
msgid "Automatic"
msgstr ""
-#: src/prefs_account.c:1497
+#: src/prefs_account.c:1546
msgid "IMAP server directory"
msgstr ""
-#: src/prefs_account.c:1501
+#: src/prefs_account.c:1550
msgid "(usually empty)"
msgstr ""
-#: src/prefs_account.c:1515
+#: src/prefs_account.c:1564
msgid "Show subscribed folders only"
msgstr ""
-#: src/prefs_account.c:1522
+#: src/prefs_account.c:1571
msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
msgstr ""
-#: src/prefs_account.c:1524
+#: src/prefs_account.c:1573
msgid "This mode uses less bandwidth, but can be slower with some servers."
msgstr ""
-#: src/prefs_account.c:1528
+#: src/prefs_account.c:1576
msgid "Filter messages on receiving"
msgstr ""
-#: src/prefs_account.c:1535
+#: src/prefs_account.c:1583
msgid "Allow filtering using plugins on receiving"
msgstr ""
-#: src/prefs_account.c:1539
+#: src/prefs_account.c:1587
msgid "'Get Mail' checks for new messages on this account"
msgstr ""
-#: src/prefs_account.c:1617 src/prefs_customheader.c:206
-#: src/prefs_matcher.c:584 src/prefs_matcher.c:1797 src/prefs_matcher.c:1818
+#: src/prefs_account.c:1666 src/prefs_customheader.c:206
+#: src/prefs_matcher.c:592 src/prefs_matcher.c:1813 src/prefs_matcher.c:1834
msgid "Header"
msgstr ""
-#: src/prefs_account.c:1619
+#: src/prefs_account.c:1668
msgid "Generate Message-ID"
msgstr ""
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1675
msgid "Add user-defined header"
msgstr ""
-#: src/prefs_account.c:1638
+#: src/prefs_account.c:1687
msgid "Authentication"
msgstr ""
-#: src/prefs_account.c:1641
+#: src/prefs_account.c:1690
msgid "SMTP Authentication (SMTP AUTH)"
msgstr ""
-#: src/prefs_account.c:1729
+#: src/prefs_account.c:1778
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr ""
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1789
msgid "Authenticate with POP3 before sending"
msgstr ""
-#: src/prefs_account.c:1755
+#: src/prefs_account.c:1804
msgid "POP authentication timeout: "
msgstr ""
-#: src/prefs_account.c:1763
+#: src/prefs_account.c:1812
msgid "minutes"
msgstr ""
-#: src/prefs_account.c:1831 src/prefs_account.c:1877
+#: src/prefs_account.c:1880 src/prefs_account.c:1926
msgid "Signature"
msgstr ""
-#: src/prefs_account.c:1834
+#: src/prefs_account.c:1883
msgid "Insert signature automatically"
msgstr ""
-#: src/prefs_account.c:1839
+#: src/prefs_account.c:1888
msgid "Signature separator"
msgstr ""
-#: src/prefs_account.c:1864
+#: src/prefs_account.c:1913
msgid "Command output"
msgstr ""
-#: src/prefs_account.c:1897
+#: src/prefs_account.c:1946
msgid "Automatically set the following addresses"
msgstr ""
-#: src/prefs_account.c:1946
+#: src/prefs_account.c:1995
msgid "Spell check dictionaries"
msgstr ""
-#: src/prefs_account.c:1956 src/prefs_folder_item.c:923
-#: src/prefs_spelling.c:224
+#: src/prefs_account.c:2005 src/prefs_folder_item.c:925
+#: src/prefs_spelling.c:160
msgid "Default dictionary"
msgstr ""
-#: src/prefs_account.c:1970 src/prefs_folder_item.c:948
-#: src/prefs_spelling.c:238
+#: src/prefs_account.c:2018 src/prefs_folder_item.c:959
+#: src/prefs_spelling.c:173
msgid "Default alternate dictionary"
msgstr ""
-#: src/prefs_account.c:2057 src/prefs_account.c:3029
-#: src/prefs_compose_writing.c:343 src/prefs_folder_item.c:1187
-#: src/prefs_folder_item.c:1530 src/prefs_quote.c:90 src/prefs_quote.c:194
-#: src/prefs_spelling.c:403 src/prefs_wrapping.c:144
+#: src/prefs_account.c:2104 src/prefs_account.c:3158
+#: src/prefs_compose_writing.c:343 src/prefs_folder_item.c:1218
+#: src/prefs_folder_item.c:1590 src/prefs_quote.c:118 src/prefs_quote.c:239
+#: src/prefs_spelling.c:325 src/prefs_wrapping.c:152
msgid "Compose"
msgstr ""
-#: src/prefs_account.c:2071 src/prefs_folder_item.c:1205 src/prefs_quote.c:104
-#: src/toolbar.c:422
+#: src/prefs_account.c:2119 src/prefs_folder_item.c:1239 src/prefs_quote.c:133
+#: src/toolbar.c:391
msgid "Reply"
msgstr ""
-#: src/prefs_account.c:2085 src/prefs_filtering_action.c:175
-#: src/prefs_folder_item.c:1223 src/prefs_quote.c:118 src/toolbar.c:426
+#: src/prefs_account.c:2134 src/prefs_filtering_action.c:176
+#: src/prefs_folder_item.c:1260 src/prefs_quote.c:148 src/toolbar.c:395
msgid "Forward"
msgstr ""
-#: src/prefs_account.c:2133
+#: src/prefs_account.c:2183
msgid "Default privacy system"
msgstr ""
-#: src/prefs_account.c:2162
+#: src/prefs_account.c:2212
msgid "Always sign messages"
msgstr ""
-#: src/prefs_account.c:2164
+#: src/prefs_account.c:2214
msgid "Always encrypt messages"
msgstr ""
-#: src/prefs_account.c:2166
+#: src/prefs_account.c:2216
+msgid "Always sign messages when replying to a signed message"
+msgstr ""
+
+#: src/prefs_account.c:2219
msgid "Always encrypt messages when replying to an encrypted message"
msgstr ""
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2222
msgid "Encrypt sent messages with your own key in addition to recipient's"
msgstr ""
-#: src/prefs_account.c:2171
+#: src/prefs_account.c:2224
msgid "Save sent encrypted messages as clear text"
msgstr ""
-#: src/prefs_account.c:2272 src/prefs_account.c:2285 src/prefs_account.c:2297
+#: src/prefs_account.c:2332 src/prefs_account.c:2345 src/prefs_account.c:2357
msgid "Don't use SSL"
msgstr ""
-#: src/prefs_account.c:2275
+#: src/prefs_account.c:2335
msgid "Use SSL for POP3 connection"
msgstr ""
-#: src/prefs_account.c:2278 src/prefs_account.c:2291 src/prefs_account.c:2318
+#: src/prefs_account.c:2338 src/prefs_account.c:2351 src/prefs_account.c:2378
msgid "Use STARTTLS command to start SSL session"
msgstr ""
-#: src/prefs_account.c:2288
+#: src/prefs_account.c:2348
msgid "Use SSL for IMAP4 connection"
msgstr ""
-#: src/prefs_account.c:2306
+#: src/prefs_account.c:2366
msgid "Use SSL for NNTP connection"
msgstr ""
-#: src/prefs_account.c:2308
+#: src/prefs_account.c:2368
msgid "Send (SMTP)"
msgstr ""
-#: src/prefs_account.c:2312
+#: src/prefs_account.c:2372
msgid "Don't use SSL (but, if necessary, use STARTTLS)"
msgstr ""
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2375
msgid "Use SSL for SMTP connection"
msgstr ""
-#: src/prefs_account.c:2326
+#: src/prefs_account.c:2381
+msgid "Client certificates"
+msgstr ""
+
+#: src/prefs_account.c:2389
+msgid "Certificate for receiving"
+msgstr ""
+
+#: src/prefs_account.c:2392 src/prefs_account.c:2414 src/prefs_account.c:2667
+#: src/wizard.c:1344 src/wizard.c:1607
+msgid "Browse"
+msgstr ""
+
+#: src/prefs_account.c:2394 src/prefs_account.c:2396 src/prefs_account.c:2416
+#: src/prefs_account.c:2418
+msgid "Client certificate file as a PKCS12 or PEM file"
+msgstr ""
+
+#: src/prefs_account.c:2411
+msgid "Certificate for sending"
+msgstr ""
+
+#: src/prefs_account.c:2444
msgid "Use non-blocking SSL"
msgstr ""
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2456
msgid "Turn this off if you have SSL connection problems"
msgstr ""
-#: src/prefs_account.c:2445
+#: src/prefs_account.c:2569
msgid "SMTP port"
msgstr ""
-#: src/prefs_account.c:2451
+#: src/prefs_account.c:2576
msgid "POP3 port"
msgstr ""
-#: src/prefs_account.c:2457
+#: src/prefs_account.c:2583
msgid "IMAP4 port"
msgstr ""
-#: src/prefs_account.c:2463
+#: src/prefs_account.c:2590
msgid "NNTP port"
msgstr ""
-#: src/prefs_account.c:2468
+#: src/prefs_account.c:2596
msgid "Domain name"
msgstr ""
-#: src/prefs_account.c:2471 src/prefs_account.c:2481
+#: src/prefs_account.c:2600 src/prefs_account.c:2609
msgid ""
"The domain name will be used in the right part of the generated Message-Ids, "
"and when connecting to SMTP servers."
msgstr ""
-#: src/prefs_account.c:2490
+#: src/prefs_account.c:2617
msgid "Use command to communicate with server"
msgstr ""
-#: src/prefs_account.c:2498
+#: src/prefs_account.c:2625
msgid "Mark cross-posted messages as read and color:"
msgstr "Mark cross-posted messages as read and colour:"
-#: src/prefs_account.c:2540
-msgid "Browse"
-msgstr ""
-
-#: src/prefs_account.c:2553
+#: src/prefs_account.c:2680
msgid "Put sent messages in"
msgstr ""
-#: src/prefs_account.c:2555
+#: src/prefs_account.c:2682
msgid "Put queued messages in"
msgstr ""
-#: src/prefs_account.c:2557
+#: src/prefs_account.c:2684
msgid "Put draft messages in"
msgstr ""
-#: src/prefs_account.c:2559
+#: src/prefs_account.c:2686
msgid "Put deleted messages in"
msgstr ""
-#: src/prefs_account.c:2614
+#: src/prefs_account.c:2741
msgid "Account name is not entered."
msgstr ""
-#: src/prefs_account.c:2618
+#: src/prefs_account.c:2745
msgid "Mail address is not entered."
msgstr ""
-#: src/prefs_account.c:2625
+#: src/prefs_account.c:2752
msgid "SMTP server is not entered."
msgstr ""
-#: src/prefs_account.c:2630
+#: src/prefs_account.c:2757
msgid "User ID is not entered."
msgstr ""
-#: src/prefs_account.c:2635
+#: src/prefs_account.c:2762
msgid "POP3 server is not entered."
msgstr ""
-#: src/prefs_account.c:2656
+#: src/prefs_account.c:2782
msgid "The default Inbox folder doesn't exist."
msgstr ""
-#: src/prefs_account.c:2662
+#: src/prefs_account.c:2788
msgid "IMAP4 server is not entered."
msgstr ""
-#: src/prefs_account.c:2667
+#: src/prefs_account.c:2793
msgid "NNTP server is not entered."
msgstr ""
-#: src/prefs_account.c:2673
+#: src/prefs_account.c:2799
msgid "local mailbox filename is not entered."
msgstr ""
-#: src/prefs_account.c:2679
+#: src/prefs_account.c:2805
msgid "mail command is not entered."
msgstr ""
-#: src/prefs_account.c:2993
+#: src/prefs_account.c:3122
msgid "Receive"
msgstr ""
-#: src/prefs_account.c:3047 src/prefs_folder_item.c:1547 src/prefs_quote.c:195
+#: src/prefs_account.c:3176 src/prefs_folder_item.c:1607 src/prefs_quote.c:240
msgid "Templates"
msgstr ""
-#: src/prefs_account.c:3065
+#: src/prefs_account.c:3194
msgid "Privacy"
msgstr ""
-#: src/prefs_account.c:3103
+#: src/prefs_account.c:3295
msgid "Advanced"
msgstr ""
-#: src/prefs_account.c:3389
+#: src/prefs_account.c:3583
msgid "Preferences for new account"
msgstr ""
-#: src/prefs_account.c:3391
+#: src/prefs_account.c:3585
#, c-format
msgid "%s - Account preferences"
msgstr ""
-#: src/prefs_account.c:3486
+#: src/prefs_account.c:3681
msgid "Select signature file"
msgstr ""
-#: src/prefs_account.c:3581
+#: src/prefs_account.c:3699 src/prefs_account.c:3716 src/wizard.c:1222
+msgid "Select certificate file"
+msgstr ""
+
+#: src/prefs_account.c:3812
msgid "Protocol:"
msgstr ""
-#: src/prefs_account.c:3720
+#: src/prefs_account.c:3951
#, c-format
msgid "%s (plugin not loaded)"
msgstr ""
-#: src/prefs_actions.c:207
+#: src/prefs_actions.c:222
msgid "Actions configuration"
msgstr ""
-#: src/prefs_actions.c:234
+#: src/prefs_actions.c:249
msgid "Menu name"
msgstr ""
-#: src/prefs_actions.c:247
-msgid "Command line"
+#: src/prefs_actions.c:262 src/prefs_receive.c:146
+msgid "Command"
+msgstr ""
+
+#: src/prefs_actions.c:282
+msgid "Shell command"
+msgstr ""
+
+#: src/prefs_actions.c:292
+msgid "Filter action"
+msgstr ""
+
+#: src/prefs_actions.c:298
+msgid "Edit filter action"
msgstr ""
-#: src/prefs_actions.c:281
+#: src/prefs_actions.c:326
msgid "Append the new action above to the list"
msgstr ""
-#: src/prefs_actions.c:283 src/prefs_filtering_action.c:564
-#: src/prefs_filtering.c:471 src/prefs_matcher.c:716 src/prefs_template.c:301
-#: src/prefs_toolbar.c:905
+#: src/prefs_actions.c:328 src/prefs_filtering_action.c:572
+#: src/prefs_filtering.c:472 src/prefs_matcher.c:729 src/prefs_template.c:306
+#: src/prefs_toolbar.c:909
msgid "Replace"
msgstr ""
-#: src/prefs_actions.c:289
+#: src/prefs_actions.c:334
msgid "Replace the selected action in list with the action above"
msgstr ""
-#: src/prefs_actions.c:297
+#: src/prefs_actions.c:342
msgid "Delete the selected action from the list"
msgstr ""
-#: src/prefs_actions.c:305 src/prefs_filtering.c:494 src/prefs_template.c:324
+#: src/prefs_actions.c:350 src/prefs_filtering.c:495 src/prefs_template.c:329
msgid "Clear all the input fields in the dialog"
msgstr "Clear all the input fields in the dialogue"
-#: src/prefs_actions.c:310 src/prefs_filtering_action.c:540
-#: src/prefs_matcher.c:693
+#: src/prefs_actions.c:355 src/prefs_filtering_action.c:548
+#: src/prefs_matcher.c:706
msgid "Info..."
msgstr ""
-#: src/prefs_actions.c:317
+#: src/prefs_actions.c:362
msgid "Show information on configuring actions"
msgstr ""
-#: src/prefs_actions.c:346
+#: src/prefs_actions.c:393
msgid "Move the selected action up"
msgstr ""
-#: src/prefs_actions.c:354
+#: src/prefs_actions.c:401
msgid "Move selected action down"
msgstr ""
-#: src/prefs_actions.c:481 src/prefs_filtering_action.c:652
-#: src/prefs_filtering.c:896 src/prefs_filtering.c:898
-#: src/prefs_filtering.c:899 src/prefs_filtering.c:986 src/prefs_matcher.c:833
-#: src/prefs_template.c:462
+#: src/prefs_actions.c:532 src/prefs_filtering_action.c:660
+#: src/prefs_filtering.c:897 src/prefs_filtering.c:899
+#: src/prefs_filtering.c:900 src/prefs_filtering.c:1010
+#: src/prefs_matcher.c:846 src/prefs_template.c:466
msgid "(New)"
msgstr ""
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:609
msgid "Menu name is not set."
msgstr ""
-#: src/prefs_actions.c:563
+#: src/prefs_actions.c:614
msgid "A leading '/' is not allowed in the menu name."
msgstr ""
-#: src/prefs_actions.c:568
+#: src/prefs_actions.c:619
msgid "Colon ':' is not allowed in the menu name."
msgstr ""
-#: src/prefs_actions.c:587
+#: src/prefs_actions.c:638
msgid "Menu name is too long."
msgstr ""
-#: src/prefs_actions.c:596
+#: src/prefs_actions.c:647
msgid "Command line not set."
msgstr ""
-#: src/prefs_actions.c:601
+#: src/prefs_actions.c:652
msgid "Menu name and command are too long."
msgstr ""
-#: src/prefs_actions.c:607
+#: src/prefs_actions.c:658
#, c-format
msgid ""
"The command\n"
@@ -9612,164 +9170,182 @@ msgid ""
"has a syntax error."
msgstr ""
-#: src/prefs_actions.c:665
+#: src/prefs_actions.c:716
msgid "Delete action"
msgstr ""
-#: src/prefs_actions.c:666
+#: src/prefs_actions.c:717
msgid "Do you really want to delete this action?"
msgstr ""
-#: src/prefs_actions.c:686
+#: src/prefs_actions.c:737
msgid "Delete all actions"
msgstr ""
-#: src/prefs_actions.c:687
+#: src/prefs_actions.c:738
msgid "Do you really want to delete all the actions?"
msgstr ""
-#: src/prefs_actions.c:828 src/prefs_actions.c:858 src/prefs_filtering.c:1534
-#: src/prefs_filtering.c:1556 src/prefs_matcher.c:1940
-#: src/prefs_template.c:518 src/prefs_template.c:540
+#: src/prefs_actions.c:901 src/prefs_actions.c:931 src/prefs_filtering.c:1558
+#: src/prefs_filtering.c:1580 src/prefs_matcher.c:1956
+#: src/prefs_template.c:566 src/prefs_template.c:591
msgid "Entry not saved"
msgstr ""
-#: src/prefs_actions.c:829 src/prefs_actions.c:859 src/prefs_filtering.c:1535
-#: src/prefs_filtering.c:1557 src/prefs_template.c:519
-#: src/prefs_template.c:541
+#: src/prefs_actions.c:902 src/prefs_actions.c:932 src/prefs_filtering.c:1559
+#: src/prefs_filtering.c:1581 src/prefs_template.c:567
+#: src/prefs_template.c:592
msgid "The entry was not saved. Close anyway?"
msgstr ""
-#: src/prefs_actions.c:830 src/prefs_actions.c:835 src/prefs_actions.c:860
-#: src/prefs_filtering.c:1514 src/prefs_filtering.c:1536
-#: src/prefs_filtering.c:1558 src/prefs_matcher.c:1942
-#: src/prefs_template.c:520 src/prefs_template.c:542 src/prefs_template.c:547
+#: src/prefs_actions.c:903 src/prefs_actions.c:908 src/prefs_actions.c:933
+#: src/prefs_actions.c:1286 src/prefs_filtering.c:1538
+#: src/prefs_filtering.c:1560 src/prefs_filtering.c:1582
+#: src/prefs_matcher.c:1958 src/prefs_template.c:568 src/prefs_template.c:593
+#: src/prefs_template.c:598
msgid "+_Continue editing"
msgstr ""
-#: src/prefs_actions.c:833
+#: src/prefs_actions.c:906
msgid "Actions list not saved"
msgstr ""
-#: src/prefs_actions.c:834
+#: src/prefs_actions.c:907
msgid "The actions list has been modified. Close anyway?"
msgstr ""
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:972
msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
msgstr ""
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:973
msgid "Use / in menu name to make submenus."
msgstr ""
-#: src/prefs_actions.c:902
+#: src/prefs_actions.c:975
msgid "<span weight=\"bold\" underline=\"single\">Command line:</span>"
msgstr ""
-#: src/prefs_actions.c:903
+#: src/prefs_actions.c:976
msgid "<span weight=\"bold\">Begin with:</span>"
msgstr ""
-#: src/prefs_actions.c:904
+#: src/prefs_actions.c:977
msgid "to send message body or selection to command's standard input"
msgstr ""
-#: src/prefs_actions.c:905
+#: src/prefs_actions.c:978
msgid "to send user provided text to command's standard input"
msgstr ""
-#: src/prefs_actions.c:906
+#: src/prefs_actions.c:979
msgid "to send user provided hidden text to command's standard input"
msgstr ""
-#: src/prefs_actions.c:907
+#: src/prefs_actions.c:980
msgid "<span weight=\"bold\">End with:</span>"
msgstr ""
-#: src/prefs_actions.c:908
+#: src/prefs_actions.c:981
msgid "to replace message body or selection with command's standard output"
msgstr ""
-#: src/prefs_actions.c:909
+#: src/prefs_actions.c:982
msgid "to insert command's standard output without replacing old text"
msgstr ""
-#: src/prefs_actions.c:910
+#: src/prefs_actions.c:983
msgid "to run command asynchronously"
msgstr ""
-#: src/prefs_actions.c:911
+#: src/prefs_actions.c:984
msgid "<span weight=\"bold\">Use:</span>"
msgstr ""
-#: src/prefs_actions.c:912
+#: src/prefs_actions.c:985
msgid "for the file of the selected message in RFC822/2822 format "
msgstr ""
-#: src/prefs_actions.c:913
+#: src/prefs_actions.c:986
msgid ""
"for the list of the files of the selected messages in RFC822/2822 format"
msgstr ""
-#: src/prefs_actions.c:914
+#: src/prefs_actions.c:987
msgid "for the file of the selected decoded message MIME part"
msgstr ""
-#: src/prefs_actions.c:915
+#: src/prefs_actions.c:988
msgid "for a user provided argument"
msgstr ""
-#: src/prefs_actions.c:916
+#: src/prefs_actions.c:989
msgid "for a user provided hidden argument (e.g. password)"
msgstr ""
-#: src/prefs_actions.c:917
+#: src/prefs_actions.c:990
msgid "for the text selection"
msgstr ""
-#: src/prefs_actions.c:918
+#: src/prefs_actions.c:991
msgid "apply filtering actions between {} to selected messages"
msgstr ""
-#: src/prefs_actions.c:919
+#: src/prefs_actions.c:992
msgid "for a literal %"
msgstr ""
-#: src/prefs_actions.c:928 src/prefs_themes.c:978
+#: src/prefs_actions.c:1001 src/prefs_themes.c:991
msgid "Actions"
msgstr ""
-#: src/prefs_actions.c:929
+#: src/prefs_actions.c:1002
msgid ""
"The Actions feature is a way for the user to launch external commands to "
"process a complete message file or just one of its parts."
msgstr ""
-#: src/prefs_actions.c:1015 src/prefs_filtering.c:1731
-#: src/prefs_template.c:999
-msgid "/D_uplicate"
+#: src/prefs_actions.c:1089 src/prefs_filtering.c:1756
+#: src/prefs_template.c:1091
+msgid "D_uplicate"
msgstr ""
-#: src/prefs_actions.c:1122
+#: src/prefs_actions.c:1199
msgid "Current actions"
msgstr ""
-#: src/prefs_common.c:229
+#: src/prefs_actions.c:1283
+msgid "Entry was modified"
+msgstr ""
+
+#: src/prefs_actions.c:1284
+msgid ""
+"Opening the filter action dialog will clear current modifications of the "
+"command line."
+msgstr ""
+"Opening the filter action dialogue will clear current modifications of the "
+"command line."
+
+#: src/prefs_actions.c:1295 src/prefs_filtering.c:1134
+#: src/prefs_filtering.c:1192
+msgid "Action string is not valid."
+msgstr ""
+
+#: src/prefs_common.c:231 src/prefs_quote.c:68
msgid "Hello,\\n"
msgstr ""
#: src/prefs_common.c:296
-msgid "On %d\\n%f wrote:\\n\\n%q"
+msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
msgstr ""
-#: src/prefs_common.c:302
+#: src/prefs_common.c:302 src/prefs_quote.c:84
msgid ""
"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
msgstr ""
-#: src/prefs_common.c:441
+#: src/prefs_common.c:442
msgid "%y/%m/%d(%a) %H:%M"
msgstr ""
@@ -9801,7 +9377,7 @@ msgstr ""
msgid "Autosave message text to Drafts folder every"
msgstr ""
-#: src/prefs_compose_writing.c:155 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:155 src/prefs_wrapping.c:100
msgid "characters"
msgstr ""
@@ -9825,7 +9401,7 @@ msgstr ""
msgid "Forwarding"
msgstr ""
-#: src/prefs_compose_writing.c:186 src/prefs_filtering_action.c:176
+#: src/prefs_compose_writing.c:186 src/prefs_filtering_action.c:177
msgid "Forward as attachment"
msgstr ""
@@ -9841,11 +9417,11 @@ msgstr ""
msgid "Ask"
msgstr ""
-#: src/prefs_compose_writing.c:202 src/toolbar.c:439
+#: src/prefs_compose_writing.c:202 src/toolbar.c:409
msgid "Insert"
msgstr ""
-#: src/prefs_compose_writing.c:203 src/toolbar.c:440
+#: src/prefs_compose_writing.c:203 src/toolbar.c:410
msgid "Attach"
msgstr ""
@@ -9870,7 +9446,7 @@ msgid "From file..."
msgstr ""
#: src/prefs_customheader.c:503 src/prefs_display_header.c:598
-#: src/prefs_matcher.c:1436 src/prefs_matcher.c:1451
+#: src/prefs_matcher.c:1452 src/prefs_matcher.c:1467
msgid "Header name is not set."
msgstr ""
@@ -9959,519 +9535,488 @@ msgstr ""
msgid "This header is already in the list."
msgstr ""
-#: src/prefs_ext_prog.c:105
+#: src/prefs_ext_prog.c:104
#, c-format
msgid "%s will be replaced with file name / URI"
msgstr ""
-#: src/prefs_ext_prog.c:123
+#: src/prefs_ext_prog.c:122
msgid "Use system defaults when possible"
msgstr ""
-#: src/prefs_ext_prog.c:148
+#: src/prefs_ext_prog.c:147
msgid "Web browser"
msgstr ""
-#: src/prefs_ext_prog.c:182
+#: src/prefs_ext_prog.c:181
msgid "Text editor"
msgstr ""
-#: src/prefs_ext_prog.c:210
+#: src/prefs_ext_prog.c:209
msgid "Command for 'Display as text'"
msgstr ""
-#: src/prefs_ext_prog.c:223
+#: src/prefs_ext_prog.c:222
msgid ""
"This option enables MIME parts to be displayed in the message view via a "
"script when using the 'Display as text' contextual menu item"
msgstr ""
-#: src/prefs_ext_prog.c:234
+#: src/prefs_ext_prog.c:232
msgid "Print command"
msgstr ""
-#: src/prefs_ext_prog.c:300 src/prefs_image_viewer.c:143
-#: src/prefs_message.c:293
+#: src/prefs_ext_prog.c:298 src/prefs_image_viewer.c:140
+#: src/prefs_message.c:303
msgid "Message View"
msgstr ""
-#: src/prefs_ext_prog.c:301
+#: src/prefs_ext_prog.c:299
msgid "External Programs"
msgstr ""
-#: src/prefs_filtering_action.c:161
+#: src/prefs_filtering_action.c:162
msgid "Move"
msgstr ""
-#: src/prefs_filtering_action.c:162
+#: src/prefs_filtering_action.c:163
msgid "Copy"
msgstr ""
-#: src/prefs_filtering_action.c:164
+#: src/prefs_filtering_action.c:165
msgid "Hide"
msgstr ""
-#: src/prefs_filtering_action.c:165 src/prefs_filtering_action.c:166
-#: src/prefs_filtering_action.c:167 src/prefs_filtering_action.c:168
-#: src/prefs_filtering_action.c:169 src/prefs_filtering_action.c:170
-#: src/prefs_filtering_action.c:171 src/prefs_filtering_action.c:172
+#: src/prefs_filtering_action.c:166 src/prefs_filtering_action.c:167
+#: src/prefs_filtering_action.c:168 src/prefs_filtering_action.c:169
+#: src/prefs_filtering_action.c:170 src/prefs_filtering_action.c:171
+#: src/prefs_filtering_action.c:172 src/prefs_filtering_action.c:173
msgid "Message flags"
msgstr ""
-#: src/prefs_filtering_action.c:165 src/prefs_summary_column.c:81
-#: src/summaryview.c:2604
+#: src/prefs_filtering_action.c:166 src/prefs_summary_column.c:77
+#: src/summaryview.c:2808
msgid "Mark"
msgstr ""
-#: src/prefs_filtering_action.c:167
-msgid "Lock"
-msgstr ""
-
-#: src/prefs_filtering_action.c:168
-msgid "Unlock"
-msgstr ""
-
-#: src/prefs_filtering_action.c:169
-msgid "Mark as read"
-msgstr ""
-
#: src/prefs_filtering_action.c:170
-msgid "Mark as unread"
+msgid "Mark as read"
msgstr ""
#: src/prefs_filtering_action.c:171
-msgid "Mark as spam"
-msgstr ""
-
-#: src/prefs_filtering_action.c:172
-msgid "Mark as ham"
+msgid "Mark as unread"
msgstr ""
-#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:1361
-#: src/toolbar.c:189 src/toolbar.c:447 src/toolbar.c:1994
+#: src/prefs_filtering_action.c:174 src/prefs_filtering_action.c:1372
+#: src/toolbar.c:191 src/toolbar.c:417 src/toolbar.c:2034
msgid "Execute"
msgstr ""
-#: src/prefs_filtering_action.c:174
+#: src/prefs_filtering_action.c:175
msgid "Color label"
msgstr "Colour label"
-#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
-#: src/prefs_filtering_action.c:177
+#: src/prefs_filtering_action.c:176 src/prefs_filtering_action.c:177
+#: src/prefs_filtering_action.c:178
msgid "Resend"
msgstr ""
-#: src/prefs_filtering_action.c:177
+#: src/prefs_filtering_action.c:178 src/summaryview.c:523
msgid "Redirect"
msgstr ""
-#: src/prefs_filtering_action.c:178 src/prefs_filtering_action.c:179
-#: src/prefs_filtering_action.c:1365 src/prefs_matcher.c:587
-#: src/prefs_summary_column.c:90 src/summaryview.c:552
+#: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:1376 src/prefs_matcher.c:598
+#: src/prefs_summary_column.c:86 src/summaryview.c:603
msgid "Score"
msgstr ""
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:179
msgid "Change score"
msgstr ""
-#: src/prefs_filtering_action.c:179
+#: src/prefs_filtering_action.c:180
msgid "Set score"
msgstr ""
-#: src/prefs_filtering_action.c:180 src/prefs_filtering_action.c:181
-#: src/prefs_filtering_action.c:182 src/prefs_matcher.c:589
-#: src/prefs_summary_column.c:92 src/summaryview.c:554
+#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:183 src/prefs_matcher.c:602
+#: src/prefs_summary_column.c:88 src/summaryview.c:605
msgid "Tags"
msgstr ""
-#: src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:181
msgid "Apply tag"
msgstr ""
-#: src/prefs_filtering_action.c:181
+#: src/prefs_filtering_action.c:182
msgid "Unset tag"
msgstr ""
-#: src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:183
msgid "Clear tags"
msgstr ""
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:184 src/prefs_filtering_action.c:185
msgid "Threads"
msgstr ""
-#: src/prefs_filtering_action.c:183 src/toolbar.c:192 src/toolbar.c:432
-msgid "Ignore thread"
-msgstr ""
-
-#: src/prefs_filtering_action.c:184 src/toolbar.c:193 src/toolbar.c:433
-msgid "Watch thread"
-msgstr ""
-
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
msgid "Stop filter"
msgstr ""
-#: src/prefs_filtering_action.c:382
-msgid "Filtering action configuration"
+#: src/prefs_filtering_action.c:389
+msgid "Action configuration"
msgstr ""
-#: src/prefs_filtering_action.c:399 src/prefs_filtering.c:1904
-#: src/prefs_matcher.c:551
+#: src/prefs_filtering_action.c:406 src/prefs_filtering.c:1937
+#: src/prefs_matcher.c:555
msgid "Rule"
msgstr ""
-#: src/prefs_filtering_action.c:412 src/prefs_filtering.c:427
+#: src/prefs_filtering_action.c:419 src/prefs_filtering.c:428
msgid "Action"
msgstr ""
-#: src/prefs_filtering_action.c:877
+#: src/prefs_filtering_action.c:888
msgid "Command line not set"
msgstr ""
-#: src/prefs_filtering_action.c:878
+#: src/prefs_filtering_action.c:889
msgid "Destination is not set."
msgstr ""
-#: src/prefs_filtering_action.c:889
+#: src/prefs_filtering_action.c:900
msgid "Recipient is not set."
msgstr ""
-#: src/prefs_filtering_action.c:905
+#: src/prefs_filtering_action.c:916
msgid "Score is not set"
msgstr ""
-#: src/prefs_filtering_action.c:913
+#: src/prefs_filtering_action.c:924
msgid "Header is not set."
msgstr ""
-#: src/prefs_filtering_action.c:920
+#: src/prefs_filtering_action.c:931
msgid "Target addressbook/folder is not set."
msgstr ""
-#: src/prefs_filtering_action.c:930
+#: src/prefs_filtering_action.c:941
msgid "Tag name is empty."
msgstr ""
-#: src/prefs_filtering_action.c:1152
+#: src/prefs_filtering_action.c:1163
msgid "No action was defined."
msgstr ""
-#: src/prefs_filtering_action.c:1190 src/prefs_matcher.c:1983
-#: src/quote_fmt.c:76
+#: src/prefs_filtering_action.c:1201 src/prefs_matcher.c:1999
+#: src/quote_fmt.c:78
msgid "literal %"
msgstr ""
-#: src/prefs_filtering_action.c:1199 src/prefs_matcher.c:1992
+#: src/prefs_filtering_action.c:1210 src/prefs_matcher.c:2008
msgid "filename (should not be modified)"
msgstr ""
-#: src/prefs_filtering_action.c:1200 src/prefs_matcher.c:1993
-#: src/quote_fmt.c:84
+#: src/prefs_filtering_action.c:1211 src/prefs_matcher.c:2009
+#: src/quote_fmt.c:86
msgid "new line"
msgstr ""
-#: src/prefs_filtering_action.c:1201 src/prefs_matcher.c:1994
+#: src/prefs_filtering_action.c:1212 src/prefs_matcher.c:2010
msgid "escape character for quotes"
msgstr ""
-#: src/prefs_filtering_action.c:1202 src/prefs_matcher.c:1995
+#: src/prefs_filtering_action.c:1213 src/prefs_matcher.c:2011
msgid "quote character"
msgstr ""
-#: src/prefs_filtering_action.c:1210
+#: src/prefs_filtering_action.c:1221
msgid "Filtering Action: 'Execute'"
msgstr ""
-#: src/prefs_filtering_action.c:1211
+#: src/prefs_filtering_action.c:1222
msgid ""
"'Execute' allows you to send a message or message element to an external "
"program or script.\n"
"The following symbols can be used:"
msgstr ""
-#: src/prefs_filtering_action.c:1347
+#: src/prefs_filtering_action.c:1358
msgid "Recipient"
msgstr ""
-#: src/prefs_filtering_action.c:1351
+#: src/prefs_filtering_action.c:1362
msgid "Book/Folder"
msgstr ""
-#: src/prefs_filtering_action.c:1355
+#: src/prefs_filtering_action.c:1366
msgid "Destination"
msgstr ""
-#: src/prefs_filtering_action.c:1358
+#: src/prefs_filtering_action.c:1369
msgid "Color"
msgstr "Colour"
-#: src/prefs_filtering_action.c:1442
+#: src/prefs_filtering_action.c:1453
msgid "Current action list"
msgstr ""
-#: src/prefs_filtering.c:190 src/prefs_filtering.c:353
+#: src/prefs_filtering.c:192 src/prefs_filtering.c:354
msgid "Filtering/Processing configuration"
msgstr ""
-#: src/prefs_filtering.c:257 src/prefs_filtering.c:927
-#: src/prefs_filtering.c:1018
+#: src/prefs_filtering.c:259 src/prefs_filtering.c:928
+#: src/prefs_filtering.c:1042
msgid "Filtering Account Menu|All"
msgstr ""
-#: src/prefs_filtering.c:405
+#: src/prefs_filtering.c:406
msgid "Condition"
msgstr ""
-#: src/prefs_filtering.c:418 src/prefs_filtering.c:440
+#: src/prefs_filtering.c:419 src/prefs_filtering.c:441
msgid " Define... "
msgstr ""
-#: src/prefs_filtering.c:469
+#: src/prefs_filtering.c:470
msgid "Append the new rule above to the list"
msgstr ""
-#: src/prefs_filtering.c:478
+#: src/prefs_filtering.c:479
msgid "Replace the selected rule in list with the rule above"
msgstr ""
-#: src/prefs_filtering.c:486
+#: src/prefs_filtering.c:487
msgid "Delete the selected rule from the list"
msgstr ""
-#: src/prefs_filtering.c:523
+#: src/prefs_filtering.c:524
msgid "Move the selected rule to the top"
msgstr ""
-#: src/prefs_filtering.c:526
+#: src/prefs_filtering.c:527
msgid "Page up"
msgstr ""
-#: src/prefs_filtering.c:534
+#: src/prefs_filtering.c:535
msgid "Move the selected rule one page up"
msgstr ""
-#: src/prefs_filtering.c:543
+#: src/prefs_filtering.c:544
msgid "Move the selected rule up"
msgstr ""
-#: src/prefs_filtering.c:551
+#: src/prefs_filtering.c:552
msgid "Move the selected rule down"
msgstr ""
-#: src/prefs_filtering.c:554
+#: src/prefs_filtering.c:555
msgid "Page down"
msgstr ""
-#: src/prefs_filtering.c:562
+#: src/prefs_filtering.c:563
msgid "Move the selected rule one page down"
msgstr ""
-#: src/prefs_filtering.c:571
+#: src/prefs_filtering.c:572
msgid "Move the selected rule to the bottom"
msgstr ""
-#: src/prefs_filtering.c:1074 src/prefs_filtering.c:1160
+#: src/prefs_filtering.c:1098 src/prefs_filtering.c:1184
msgid "Condition string is not valid."
msgstr ""
-#: src/prefs_filtering.c:1110 src/prefs_filtering.c:1168
-msgid "Action string is not valid."
-msgstr ""
-
-#: src/prefs_filtering.c:1147
+#: src/prefs_filtering.c:1171
msgid "Condition string is empty."
msgstr ""
-#: src/prefs_filtering.c:1153
+#: src/prefs_filtering.c:1177
msgid "Action string is empty."
msgstr ""
-#: src/prefs_filtering.c:1239
+#: src/prefs_filtering.c:1263
msgid "Delete rule"
msgstr ""
-#: src/prefs_filtering.c:1240
+#: src/prefs_filtering.c:1264
msgid "Do you really want to delete this rule?"
msgstr ""
-#: src/prefs_filtering.c:1258
+#: src/prefs_filtering.c:1282
msgid "Delete all rules"
msgstr ""
-#: src/prefs_filtering.c:1259
+#: src/prefs_filtering.c:1283
msgid "Do you really want to delete all the rules?"
msgstr ""
-#: src/prefs_filtering.c:1512
+#: src/prefs_filtering.c:1536
msgid "Filtering rules not saved"
msgstr ""
-#: src/prefs_filtering.c:1513
+#: src/prefs_filtering.c:1537
msgid "The list of filtering rules have been modified. Close anyway?"
msgstr ""
-#: src/prefs_filtering.c:1733
-msgid "/---"
+#: src/prefs_filtering.c:1759
+msgid "Move one page up"
msgstr ""
-#: src/prefs_filtering.c:1734
-msgid "/Move one page up"
+#: src/prefs_filtering.c:1760
+msgid "Move one page down"
msgstr ""
-#: src/prefs_filtering.c:1735
-msgid "/Move one page down"
-msgstr ""
-
-#: src/prefs_filtering.c:1872
+#: src/prefs_filtering.c:1905
msgid "Enable"
msgstr ""
-#: src/prefs_folder_column.c:214
+#: src/prefs_folder_column.c:210
msgid "Folder list columns configuration"
msgstr ""
-#: src/prefs_folder_column.c:231
+#: src/prefs_folder_column.c:227
msgid ""
"Select columns to be displayed in the folder list. You can modify\n"
"the order by using the Up / Down buttons or by dragging the items."
msgstr ""
-#: src/prefs_folder_column.c:260 src/prefs_summary_column.c:275
+#: src/prefs_folder_column.c:256 src/prefs_summary_column.c:271
msgid "Hidden columns"
msgstr ""
-#: src/prefs_folder_column.c:292 src/prefs_summaries.c:408
-#: src/prefs_summaries.c:539 src/prefs_summary_column.c:307
+#: src/prefs_folder_column.c:288 src/prefs_summaries.c:406
+#: src/prefs_summaries.c:552 src/prefs_summary_column.c:303
msgid "Displayed columns"
msgstr ""
-#: src/prefs_folder_column.c:331 src/prefs_msg_colors.c:500
-#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:917
+#: src/prefs_folder_column.c:327 src/prefs_msg_colors.c:496
+#: src/prefs_summary_column.c:342 src/prefs_toolbar.c:921
msgid " Use default "
msgstr ""
-#: src/prefs_folder_item.c:248 src/prefs_folder_item.c:781
+#: src/prefs_folder_item.c:250 src/prefs_folder_item.c:783
+#: src/prefs_folder_item.c:1185
msgid ""
"<i>These preferences will not be saved as this folder is a top-level one. "
"However you can use them to set them to the whole mailbox tree using \"Apply "
"to subfolders\".</i>"
msgstr ""
-#: src/prefs_folder_item.c:260 src/prefs_folder_item.c:793
+#: src/prefs_folder_item.c:262 src/prefs_folder_item.c:795
msgid ""
"Apply to\n"
"subfolders"
msgstr ""
-#: src/prefs_folder_item.c:285
+#: src/prefs_folder_item.c:287
msgid "Normal"
msgstr ""
-#: src/prefs_folder_item.c:287
+#: src/prefs_folder_item.c:289
msgid "Outbox"
msgstr ""
-#: src/prefs_folder_item.c:303
+#: src/prefs_folder_item.c:305
msgid "Folder type"
msgstr ""
-#: src/prefs_folder_item.c:315
+#: src/prefs_folder_item.c:317
msgid "Simplify Subject RegExp"
msgstr ""
-#: src/prefs_folder_item.c:341
+#: src/prefs_folder_item.c:343
msgid "Test RegExp"
msgstr ""
-#: src/prefs_folder_item.c:373
+#: src/prefs_folder_item.c:375
msgid "Folder chmod"
msgstr ""
-#: src/prefs_folder_item.c:399
+#: src/prefs_folder_item.c:401
msgid "Folder color"
msgstr "Folder colour"
-#: src/prefs_folder_item.c:412 src/prefs_folder_item.c:1376
+#: src/prefs_folder_item.c:414 src/prefs_folder_item.c:1436
msgid "Pick color for folder"
msgstr "Pick colour for folder"
-#: src/prefs_folder_item.c:430
+#: src/prefs_folder_item.c:432
msgid "Run Processing rules at start-up"
msgstr ""
-#: src/prefs_folder_item.c:445
+#: src/prefs_folder_item.c:447
msgid "Run Processing rules when opening"
msgstr ""
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:461
msgid "Scan for new mail"
msgstr ""
-#: src/prefs_folder_item.c:461
+#: src/prefs_folder_item.c:463
msgid ""
"Turn this option on if mail is delivered directly to this folder by server "
"side filtering on IMAP or by an external application"
msgstr ""
-#: src/prefs_folder_item.c:476
+#: src/prefs_folder_item.c:478
msgid "Synchronise for offline use"
msgstr ""
-#: src/prefs_folder_item.c:497
+#: src/prefs_folder_item.c:499
msgid "Fetch message bodies from the last"
msgstr ""
-#: src/prefs_folder_item.c:504
+#: src/prefs_folder_item.c:506
msgid "0: all bodies"
msgstr ""
-#: src/prefs_folder_item.c:512
+#: src/prefs_folder_item.c:514
msgid "Remove older messages bodies"
msgstr ""
-#: src/prefs_folder_item.c:529
+#: src/prefs_folder_item.c:531
msgid "Discard folder cache"
msgstr ""
-#: src/prefs_folder_item.c:802
+#: src/prefs_folder_item.c:804
msgid "Request Return Receipt"
msgstr ""
-#: src/prefs_folder_item.c:817
+#: src/prefs_folder_item.c:819
msgid "Save copy of outgoing messages to this folder instead of Sent"
msgstr ""
-#: src/prefs_folder_item.c:830
+#: src/prefs_folder_item.c:832
msgid "Default To:"
msgstr ""
-#: src/prefs_folder_item.c:851
+#: src/prefs_folder_item.c:853
msgid "Default To: for replies"
msgstr ""
-#: src/prefs_folder_item.c:872
+#: src/prefs_folder_item.c:874
msgid "Default account"
msgstr ""
-#: src/prefs_folder_item.c:1389
+#: src/prefs_folder_item.c:1449
msgid "Discard cache"
msgstr ""
-#: src/prefs_folder_item.c:1390
+#: src/prefs_folder_item.c:1450
msgid "Do you really want to discard the local cached data for this folder?"
msgstr ""
-#: src/prefs_folder_item.c:1392
+#: src/prefs_folder_item.c:1452
msgid "+Discard"
msgstr ""
-#: src/prefs_folder_item.c:1512
+#: src/prefs_folder_item.c:1572
msgid "General"
msgstr ""
-#: src/prefs_folder_item.c:1576
+#: src/prefs_folder_item.c:1646
#, c-format
msgid "Properties for folder %s"
msgstr ""
@@ -10480,7 +10025,7 @@ msgstr ""
msgid "Folder and Message Lists"
msgstr ""
-#: src/prefs_fonts.c:102 src/prefs_matcher.c:1862
+#: src/prefs_fonts.c:102 src/prefs_matcher.c:1878
msgid "Message"
msgstr ""
@@ -10504,8 +10049,8 @@ msgstr ""
msgid "Message Printing"
msgstr ""
-#: src/prefs_fonts.c:277 src/prefs_msg_colors.c:838 src/prefs_summaries.c:669
-#: src/prefs_themes.c:362
+#: src/prefs_fonts.c:277 src/prefs_msg_colors.c:830 src/prefs_summaries.c:685
+#: src/prefs_themes.c:364
msgid "Display"
msgstr ""
@@ -10513,7 +10058,7 @@ msgstr ""
msgid "Fonts"
msgstr ""
-#: src/prefs_gtk.c:938
+#: src/prefs_gtk.c:939 src/toolbar.c:199 src/toolbar.c:405
msgid "Preferences"
msgstr ""
@@ -10521,47 +10066,47 @@ msgstr ""
msgid "Automatically display attached images"
msgstr ""
-#: src/prefs_image_viewer.c:77
+#: src/prefs_image_viewer.c:75
msgid "Resize attached images by default"
msgstr ""
-#: src/prefs_image_viewer.c:80
+#: src/prefs_image_viewer.c:78
msgid "Clicking image toggles scaling"
msgstr ""
-#: src/prefs_image_viewer.c:86
+#: src/prefs_image_viewer.c:83
msgid "Display images inline"
msgstr ""
-#: src/prefs_image_viewer.c:92
+#: src/prefs_image_viewer.c:89
msgid "Print images"
msgstr ""
-#: src/prefs_image_viewer.c:144
+#: src/prefs_image_viewer.c:141
msgid "Image Viewer"
msgstr ""
-#: src/prefs_logging.c:146 src/prefs_logging.c:261
+#: src/prefs_logging.c:147 src/prefs_logging.c:254
msgid "Restrict the log window to"
msgstr ""
-#: src/prefs_logging.c:160 src/prefs_logging.c:275
+#: src/prefs_logging.c:159 src/prefs_logging.c:266
msgid "0 to stop logging in the log window"
msgstr ""
-#: src/prefs_logging.c:163 src/prefs_logging.c:278
+#: src/prefs_logging.c:161 src/prefs_logging.c:268
msgid "lines"
msgstr ""
-#: src/prefs_logging.c:172
+#: src/prefs_logging.c:171
msgid "Filtering/processing log"
msgstr ""
-#: src/prefs_logging.c:175
+#: src/prefs_logging.c:174
msgid "Enable logging of filtering/processing rules"
msgstr ""
-#: src/prefs_logging.c:183
+#: src/prefs_logging.c:180
msgid ""
"If checked, turns on logging of filtering and processing rules.\n"
"The log is accessible from 'Tools/Filtering log'.\n"
@@ -10569,47 +10114,47 @@ msgid ""
"might be critical when applying many rules upon thousands of messages."
msgstr ""
-#: src/prefs_logging.c:191
+#: src/prefs_logging.c:187
msgid "Log filtering/processing when..."
msgstr ""
-#: src/prefs_logging.c:195
+#: src/prefs_logging.c:191
msgid "filtering at incorporation"
msgstr ""
-#: src/prefs_logging.c:197
+#: src/prefs_logging.c:193
msgid "pre-processing folders"
msgstr ""
-#: src/prefs_logging.c:202
+#: src/prefs_logging.c:198
msgid "manually filtering"
msgstr ""
-#: src/prefs_logging.c:204
+#: src/prefs_logging.c:200
msgid "post-processing folders"
msgstr ""
-#: src/prefs_logging.c:211
+#: src/prefs_logging.c:207
msgid "processing folders"
msgstr ""
-#: src/prefs_logging.c:226
+#: src/prefs_logging.c:222
msgid "Log level"
msgstr ""
-#: src/prefs_logging.c:235
+#: src/prefs_logging.c:231
msgid "Low"
msgstr ""
-#: src/prefs_logging.c:236
+#: src/prefs_logging.c:232
msgid "Medium"
msgstr ""
-#: src/prefs_logging.c:237
+#: src/prefs_logging.c:233
msgid "High"
msgstr ""
-#: src/prefs_logging.c:244
+#: src/prefs_logging.c:238
msgid ""
"Select the level of detail of the logging.\n"
"Choose Low to see when rules are applied, which conditions match or don't "
@@ -10621,348 +10166,353 @@ msgid ""
"Caution: the higher the level, the greater the impact on performance."
msgstr ""
-#: src/prefs_logging.c:290
+#: src/prefs_logging.c:280
msgid "Disk log"
msgstr ""
-#: src/prefs_logging.c:292
+#: src/prefs_logging.c:282
msgid "Write the following information to disk..."
msgstr ""
-#: src/prefs_logging.c:300
+#: src/prefs_logging.c:290
msgid "Warning messages"
msgstr ""
-#: src/prefs_logging.c:301
+#: src/prefs_logging.c:291
msgid "Network protocol messages"
msgstr ""
-#: src/prefs_logging.c:305
+#: src/prefs_logging.c:295
msgid "Error messages"
msgstr ""
-#: src/prefs_logging.c:306
+#: src/prefs_logging.c:296
msgid "Status messages for filtering/processing log"
msgstr ""
-#: src/prefs_logging.c:429
+#: src/prefs_logging.c:428
msgid "Logging"
msgstr ""
-#: src/prefs_matcher.c:307
+#: src/prefs_matcher.c:309
msgid "more than"
msgstr ""
-#: src/prefs_matcher.c:308
+#: src/prefs_matcher.c:310
msgid "less than"
msgstr ""
-#: src/prefs_matcher.c:313
+#: src/prefs_matcher.c:315
msgid "weeks"
msgstr ""
-#: src/prefs_matcher.c:317
+#: src/prefs_matcher.c:319
msgid "higher than"
msgstr ""
-#: src/prefs_matcher.c:318
+#: src/prefs_matcher.c:320
msgid "lower than"
msgstr ""
-#: src/prefs_matcher.c:319 src/prefs_matcher.c:325
+#: src/prefs_matcher.c:321 src/prefs_matcher.c:327
msgid "exactly"
msgstr ""
-#: src/prefs_matcher.c:323
+#: src/prefs_matcher.c:325
msgid "greater than"
msgstr ""
-#: src/prefs_matcher.c:324
+#: src/prefs_matcher.c:326
msgid "smaller than"
msgstr ""
-#: src/prefs_matcher.c:329
+#: src/prefs_matcher.c:331
msgid "bytes"
msgstr ""
-#: src/prefs_matcher.c:330
+#: src/prefs_matcher.c:332
msgid "kilobytes"
msgstr ""
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:333
msgid "megabytes"
msgstr ""
-#: src/prefs_matcher.c:335
+#: src/prefs_matcher.c:337
msgid "contains"
msgstr ""
-#: src/prefs_matcher.c:336
+#: src/prefs_matcher.c:338
msgid "doesn't contain"
msgstr ""
-#: src/prefs_matcher.c:358
+#: src/prefs_matcher.c:360
msgid "headers part"
msgstr ""
-#: src/prefs_matcher.c:359
+#: src/prefs_matcher.c:361
msgid "body part"
msgstr ""
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:362
msgid "whole message"
msgstr ""
-#: src/prefs_matcher.c:366 src/summaryview.c:5778
+#: src/prefs_matcher.c:368 src/summaryview.c:6049
msgid "Marked"
msgstr ""
-#: src/prefs_matcher.c:367 src/summaryview.c:5776
+#: src/prefs_matcher.c:369 src/summaryview.c:6047
msgid "Deleted"
msgstr ""
-#: src/prefs_matcher.c:368
+#: src/prefs_matcher.c:370
msgid "Replied"
msgstr ""
-#: src/prefs_matcher.c:369 src/summaryview.c:5770
+#: src/prefs_matcher.c:371 src/summaryview.c:6041
msgid "Forwarded"
msgstr ""
-#: src/prefs_matcher.c:371 src/summaryview.c:5762 src/toolbar.c:429
-#: src/toolbar.c:923 src/toolbar.c:1903
+#: src/prefs_matcher.c:373 src/summaryview.c:6033 src/toolbar.c:398
+#: src/toolbar.c:920 src/toolbar.c:1924
msgid "Spam"
msgstr ""
-#: src/prefs_matcher.c:375
+#: src/prefs_matcher.c:377
msgid "set"
msgstr ""
-#: src/prefs_matcher.c:376
+#: src/prefs_matcher.c:378
msgid "not set"
msgstr ""
-#: src/prefs_matcher.c:380
+#: src/prefs_matcher.c:382
msgid "yes"
msgstr ""
-#: src/prefs_matcher.c:381
+#: src/prefs_matcher.c:383
msgid "no"
msgstr ""
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:387
msgid "Any tags"
msgstr ""
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:388
msgid "Specific tag"
msgstr ""
-#: src/prefs_matcher.c:390
+#: src/prefs_matcher.c:392
msgid "ignored"
msgstr ""
-#: src/prefs_matcher.c:391
+#: src/prefs_matcher.c:393
msgid "not ignored"
msgstr ""
-#: src/prefs_matcher.c:392
+#: src/prefs_matcher.c:394
msgid "watched"
msgstr ""
-#: src/prefs_matcher.c:393
+#: src/prefs_matcher.c:395
msgid "not watched"
msgstr ""
-#: src/prefs_matcher.c:397
+#: src/prefs_matcher.c:399
msgid "found"
msgstr ""
-#: src/prefs_matcher.c:398
+#: src/prefs_matcher.c:400
msgid "not found"
msgstr ""
-#: src/prefs_matcher.c:402
+#: src/prefs_matcher.c:404
msgid "0 (Passed)"
msgstr ""
-#: src/prefs_matcher.c:403
+#: src/prefs_matcher.c:405
msgid "non-0 (Failed)"
msgstr ""
-#: src/prefs_matcher.c:534
+#: src/prefs_matcher.c:538
msgid "Condition configuration"
msgstr ""
-#: src/prefs_matcher.c:578
+#: src/prefs_matcher.c:582
msgid "Match criteria:"
msgstr ""
-#: src/prefs_matcher.c:584
+#: src/prefs_matcher.c:591
msgid "All messages"
msgstr ""
-#: src/prefs_matcher.c:585
+#: src/prefs_matcher.c:593
msgid "Age"
msgstr ""
-#: src/prefs_matcher.c:585
+#: src/prefs_matcher.c:594
msgid "Phrase"
msgstr ""
-#: src/prefs_matcher.c:585
+#: src/prefs_matcher.c:595
msgid "Flags"
msgstr ""
-#: src/prefs_matcher.c:586 src/prefs_msg_colors.c:413
+#: src/prefs_matcher.c:596 src/prefs_msg_colors.c:412
msgid "Color labels"
msgstr "Colour labels"
-#: src/prefs_matcher.c:586
+#: src/prefs_matcher.c:597
msgid "Thread"
msgstr ""
-#: src/prefs_matcher.c:588
+#: src/prefs_matcher.c:600
msgid "Partially downloaded"
msgstr ""
-#: src/prefs_matcher.c:590
+#: src/prefs_matcher.c:603
msgid "External program test"
msgstr ""
-#: src/prefs_matcher.c:684
+#: src/prefs_matcher.c:666 src/prefs_matcher.c:1473 src/prefs_matcher.c:1488
+#: src/prefs_matcher.c:2336
+msgid "Filtering Matcher Menu|All"
+msgstr ""
+
+#: src/prefs_matcher.c:697
msgid "Use regexp"
msgstr ""
-#: src/prefs_matcher.c:760
+#: src/prefs_matcher.c:773
msgid "Message must match"
msgstr ""
-#: src/prefs_matcher.c:764
+#: src/prefs_matcher.c:777
msgid "at least one"
msgstr ""
-#: src/prefs_matcher.c:765
+#: src/prefs_matcher.c:778
msgid "all"
msgstr ""
-#: src/prefs_matcher.c:768
+#: src/prefs_matcher.c:781
msgid "of above rules"
msgstr ""
-#: src/prefs_matcher.c:1383 src/prefs_matcher.c:1441
+#: src/prefs_matcher.c:1399 src/prefs_matcher.c:1457
msgid "Search pattern is not set."
msgstr ""
-#: src/prefs_matcher.c:1392
+#: src/prefs_matcher.c:1408
msgid "Test command is not set."
msgstr ""
-#: src/prefs_matcher.c:1458
+#: src/prefs_matcher.c:1474
msgid "all addresses in all headers"
msgstr ""
-#: src/prefs_matcher.c:1461
+#: src/prefs_matcher.c:1477
msgid "any address in any header"
msgstr ""
-#: src/prefs_matcher.c:1463
+#: src/prefs_matcher.c:1479
#, c-format
msgid "the address(es) in header '%s'"
msgstr ""
-#: src/prefs_matcher.c:1464
+#: src/prefs_matcher.c:1480
#, c-format
msgid ""
"Book/folder path is not set.\n"
"\n"
-"If you want to match %s against the whole address book, you have to select "
-"'Any' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select '%"
+"s' from the book/folder drop-down list."
msgstr ""
-#: src/prefs_matcher.c:1677
+#: src/prefs_matcher.c:1693
msgid "Headers part"
msgstr ""
-#: src/prefs_matcher.c:1681
+#: src/prefs_matcher.c:1697
msgid "Body part"
msgstr ""
-#: src/prefs_matcher.c:1685
+#: src/prefs_matcher.c:1701
msgid "Whole message"
msgstr ""
-#: src/prefs_matcher.c:1796 src/prefs_matcher.c:1835
+#: src/prefs_matcher.c:1812 src/prefs_matcher.c:1851
msgid "in"
msgstr ""
-#: src/prefs_matcher.c:1798
+#: src/prefs_matcher.c:1814
msgid "content is"
msgstr ""
-#: src/prefs_matcher.c:1806
+#: src/prefs_matcher.c:1822
msgid "Age is"
msgstr ""
-#: src/prefs_matcher.c:1811
+#: src/prefs_matcher.c:1827
msgid "Flag"
msgstr ""
-#: src/prefs_matcher.c:1812 src/prefs_matcher.c:1826
+#: src/prefs_matcher.c:1828 src/prefs_matcher.c:1842
msgid "is"
msgstr ""
-#: src/prefs_matcher.c:1817
+#: src/prefs_matcher.c:1833
msgid "Name:"
msgstr ""
-#: src/prefs_matcher.c:1825
+#: src/prefs_matcher.c:1841
msgid "Label"
msgstr ""
-#: src/prefs_matcher.c:1830
+#: src/prefs_matcher.c:1846
msgid "Value:"
msgstr ""
-#: src/prefs_matcher.c:1845
+#: src/prefs_matcher.c:1861
msgid "Score is"
msgstr ""
-#: src/prefs_matcher.c:1846
+#: src/prefs_matcher.c:1862
msgid "points"
msgstr ""
-#: src/prefs_matcher.c:1856
+#: src/prefs_matcher.c:1872
msgid "Size is"
msgstr ""
-#: src/prefs_matcher.c:1861
+#: src/prefs_matcher.c:1877
msgid "Scope:"
msgstr ""
-#: src/prefs_matcher.c:1863
+#: src/prefs_matcher.c:1879
msgid "tags"
msgstr ""
-#: src/prefs_matcher.c:1868
+#: src/prefs_matcher.c:1884
msgid "type is"
msgstr ""
-#: src/prefs_matcher.c:1872
+#: src/prefs_matcher.c:1888
msgid "Program returns"
msgstr ""
-#: src/prefs_matcher.c:1941
+#: src/prefs_matcher.c:1957
msgid ""
"The entry was not saved.\n"
"Close anyway?"
msgstr ""
-#: src/prefs_matcher.c:2003
+#: src/prefs_matcher.c:2019
msgid "Match Type: 'Test'"
msgstr ""
-#: src/prefs_matcher.c:2004
+#: src/prefs_matcher.c:2020
msgid ""
"'Test' allows you to test a message or message element using an external "
"program or script. The program will return either 0 or 1.\n"
@@ -10970,71 +10520,75 @@ msgid ""
"The following symbols can be used:"
msgstr ""
-#: src/prefs_matcher.c:2101
+#: src/prefs_matcher.c:2117
msgid "Current condition rules"
msgstr ""
-#: src/prefs_message.c:108
+#: src/prefs_message.c:110
msgid "Headers"
msgstr ""
-#: src/prefs_message.c:111
+#: src/prefs_message.c:113
msgid "Display header pane above message view"
msgstr ""
-#: src/prefs_message.c:115
+#: src/prefs_message.c:117
msgid "Display (X-)Face in message view"
msgstr ""
-#: src/prefs_message.c:118
+#: src/prefs_message.c:120
msgid "Display Face in message view"
msgstr ""
-#: src/prefs_message.c:132
+#: src/prefs_message.c:134
msgid "Display headers in message view"
msgstr ""
-#: src/prefs_message.c:144
+#: src/prefs_message.c:146
msgid "HTML messages"
msgstr ""
-#: src/prefs_message.c:147
+#: src/prefs_message.c:149
msgid "Render HTML messages as text"
msgstr ""
-#: src/prefs_message.c:150
+#: src/prefs_message.c:152
msgid "Render HTML-only messages with plugin if possible"
msgstr ""
-#: src/prefs_message.c:160
+#: src/prefs_message.c:155
+msgid "Select the HTML part of multipart/alternative messages"
+msgstr ""
+
+#: src/prefs_message.c:165
msgid "Line space"
msgstr ""
-#: src/prefs_message.c:174 src/prefs_message.c:207
+#: src/prefs_message.c:179 src/prefs_message.c:212
msgid "pixel(s)"
msgstr ""
-#: src/prefs_message.c:179
+#: src/prefs_message.c:184
msgid "Scroll"
msgstr ""
-#: src/prefs_message.c:181
+#: src/prefs_message.c:186
msgid "Half page"
msgstr ""
-#: src/prefs_message.c:187
+#: src/prefs_message.c:192
msgid "Smooth scroll"
msgstr ""
-#: src/prefs_message.c:193
+#: src/prefs_message.c:198
msgid "Step"
msgstr ""
-#: src/prefs_message.c:214
+#: src/prefs_message.c:219
msgid "Show attachment descriptions (rather than names)"
msgstr ""
-#: src/prefs_message.c:294
+#: src/prefs_message.c:304
msgid "Text Options"
msgstr ""
@@ -11058,77 +10612,77 @@ msgstr "Cycle quote colours"
msgid "If there are more than 3 quote levels, the colors will be reused"
msgstr "If there are more than 3 quote levels, the colours will be reused"
-#: src/prefs_msg_colors.c:187
+#: src/prefs_msg_colors.c:186
msgid "1st Level"
msgstr ""
-#: src/prefs_msg_colors.c:193 src/prefs_msg_colors.c:219
-#: src/prefs_msg_colors.c:245
+#: src/prefs_msg_colors.c:192 src/prefs_msg_colors.c:218
+#: src/prefs_msg_colors.c:244
msgid "Text"
msgstr ""
-#: src/prefs_msg_colors.c:207
+#: src/prefs_msg_colors.c:206
msgid "Tooltip|Pick color for 1st level text"
msgstr "Pick colour for 1st level text"
-#: src/prefs_msg_colors.c:213
+#: src/prefs_msg_colors.c:212
msgid "2nd Level"
msgstr ""
-#: src/prefs_msg_colors.c:233
+#: src/prefs_msg_colors.c:232
msgid "Tooltip|Pick color for 2nd level text"
msgstr "Pick colour for 2nd level text"
-#: src/prefs_msg_colors.c:239
+#: src/prefs_msg_colors.c:238
msgid "3rd Level"
msgstr ""
-#: src/prefs_msg_colors.c:259
+#: src/prefs_msg_colors.c:258
msgid "Tooltip|Pick color for 3rd level text"
msgstr "Pick colour for 3rd level text"
-#: src/prefs_msg_colors.c:266
+#: src/prefs_msg_colors.c:265
msgid "Enable coloration of text background"
msgstr "Enable colouration of text background"
-#: src/prefs_msg_colors.c:282
+#: src/prefs_msg_colors.c:281
msgid "Tooltip|Pick color for 1st level text background"
msgstr "Pick colour for 1st level text background"
-#: src/prefs_msg_colors.c:284 src/prefs_msg_colors.c:305
-#: src/prefs_msg_colors.c:326
+#: src/prefs_msg_colors.c:283 src/prefs_msg_colors.c:304
+#: src/prefs_msg_colors.c:325
msgid "Background"
msgstr ""
-#: src/prefs_msg_colors.c:303
+#: src/prefs_msg_colors.c:302
msgid "Tooltip|Pick color for 2nd level text background"
msgstr "Pick colour for 2nd level text background"
-#: src/prefs_msg_colors.c:324
+#: src/prefs_msg_colors.c:323
msgid "Tooltip|Pick color for 3rd level text background"
msgstr "Pick colour for 3rd level text background"
-#: src/prefs_msg_colors.c:344
+#: src/prefs_msg_colors.c:343
msgid "Tooltip|Pick color for links"
msgstr "Pick colour for links"
-#: src/prefs_msg_colors.c:346
+#: src/prefs_msg_colors.c:345
msgid "URI link"
msgstr ""
-#: src/prefs_msg_colors.c:363
+#: src/prefs_msg_colors.c:362
msgid "Tooltip|Pick color for signatures"
msgstr "Pick colour for signatures"
-#: src/prefs_msg_colors.c:365
+#: src/prefs_msg_colors.c:364
msgid "Signatures"
msgstr ""
-#: src/prefs_msg_colors.c:370 src/prefs_summaries.c:356
+#: src/prefs_msg_colors.c:369 src/prefs_summaries.c:354
msgid "Folder list"
msgstr ""
-#: src/prefs_msg_colors.c:383
+#: src/prefs_msg_colors.c:382
msgid ""
"Pick color for Target folder. Target folder is used when the option 'Execute "
"immediately when moving or deleting messages' is turned off"
@@ -11136,156 +10690,176 @@ msgstr ""
"Pick colour for Target folder. Target folder is used when the option "
"'Execute immediately when moving or deleting messages' is turned off"
-#: src/prefs_msg_colors.c:387
+#: src/prefs_msg_colors.c:386
msgid "Target folder"
msgstr ""
-#: src/prefs_msg_colors.c:402
+#: src/prefs_msg_colors.c:401
msgid "Pick color for folders containing new messages"
msgstr "Pick colour for folders containing new messages"
-#: src/prefs_msg_colors.c:404
+#: src/prefs_msg_colors.c:403
msgid "Folder containing new messages"
msgstr ""
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:431 src/prefs_msg_colors.c:463
+#: src/prefs_msg_colors.c:430 src/prefs_msg_colors.c:461
#, c-format
msgid "Tooltip|Pick color for 'color %d'"
msgstr "Pick colour for 'color %d'"
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:435 src/prefs_msg_colors.c:467
+#: src/prefs_msg_colors.c:434 src/prefs_msg_colors.c:465
#, c-format
msgid "Set label for 'color %d'"
msgstr "Pick colour for 'color %d'"
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:596
+#: src/prefs_msg_colors.c:592
#, c-format
msgid "Dialog title|Pick color for 'color %d'"
msgstr "Pick colour for 'color %d'"
-#: src/prefs_msg_colors.c:604
+#: src/prefs_msg_colors.c:600
msgid "Dialog title|Pick color for 1st level text"
msgstr "Pick colour for 1st level text"
-#: src/prefs_msg_colors.c:607
+#: src/prefs_msg_colors.c:603
msgid "Dialog title|Pick color for 2nd level text"
msgstr "Pick colour for 2nd level text"
-#: src/prefs_msg_colors.c:610
+#: src/prefs_msg_colors.c:606
msgid "Dialog title|Pick color for 3rd level text"
msgstr "Pick colour for 3rd level text"
-#: src/prefs_msg_colors.c:613
+#: src/prefs_msg_colors.c:609
msgid "Dialog title|Pick color for 1st level text background"
msgstr "Pick colour for 1st level text background"
-#: src/prefs_msg_colors.c:616
+#: src/prefs_msg_colors.c:612
msgid "Dialog title|Pick color for 2nd level text background"
msgstr "Pick colour for 2nd level text background"
-#: src/prefs_msg_colors.c:619
+#: src/prefs_msg_colors.c:615
msgid "Dialog title|Pick color for 3rd level text background"
msgstr "Pick colour for 3rd level text background"
-#: src/prefs_msg_colors.c:622
+#: src/prefs_msg_colors.c:618
msgid "Dialog title|Pick color for links"
msgstr "Pick colour for links"
-#: src/prefs_msg_colors.c:625
+#: src/prefs_msg_colors.c:621
msgid "Dialog title|Pick color for target folder"
msgstr "Pick colour for target folder"
-#: src/prefs_msg_colors.c:628
+#: src/prefs_msg_colors.c:624
msgid "Dialog title|Pick color for signatures"
msgstr "Pick colour for signatures"
-#: src/prefs_msg_colors.c:631
+#: src/prefs_msg_colors.c:627
msgid "Dialog title|Pick color for folder"
msgstr "Pick colour for folder"
-#: src/prefs_msg_colors.c:839
+#: src/prefs_msg_colors.c:831
msgid "Colors"
msgstr "Colours"
-#: src/prefs_other.c:92
-msgid "Select key bindings"
+#: src/prefs_other.c:94
+msgid "Choose preset keyboard shortcuts"
msgstr ""
-#: src/prefs_other.c:106
+#: src/prefs_other.c:108
msgid "Select preset:"
msgstr ""
-#: src/prefs_other.c:114 src/prefs_other.c:460
+#: src/prefs_other.c:116 src/prefs_other.c:462
msgid "Old Sylpheed"
msgstr ""
-#: src/prefs_other.c:122
+#: src/prefs_other.c:124
msgid ""
"You can also modify each menu shortcut by pressing\n"
"any key(s) when focusing the mouse pointer on the item."
msgstr ""
-#: src/prefs_other.c:517
+#: src/prefs_other.c:523
msgid "Add address to destination when double-clicked"
msgstr ""
-#: src/prefs_other.c:520
+#: src/prefs_other.c:526
msgid "On exit"
msgstr ""
-#: src/prefs_other.c:523
+#: src/prefs_other.c:529
msgid "Confirm on exit"
msgstr ""
-#: src/prefs_other.c:530
+#: src/prefs_other.c:536
msgid "Empty trash on exit"
msgstr "Empty wastebin on exit"
-#: src/prefs_other.c:533
+#: src/prefs_other.c:539
msgid "Warn if there are queued messages"
msgstr ""
-#: src/prefs_other.c:535
+#: src/prefs_other.c:541
msgid "Keyboard shortcuts"
msgstr ""
-#: src/prefs_other.c:538
-msgid "Enable customisable menu shortcuts"
+#: src/prefs_other.c:544
+msgid "Enable customisable keyboard shortcuts"
msgstr ""
-#: src/prefs_other.c:542
+#: src/prefs_other.c:547
msgid ""
"If checked, you can change the keyboard shortcuts of most of the menu items "
"by focusing on the menu item and pressing a key combination.\n"
-"Uncheck this option if you want to lock all existing menu shortcuts."
+"Uncheck this option if you want to lock all existing keyboard shortcuts."
msgstr ""
-#: src/prefs_other.c:549
-msgid " Set key bindings... "
+#: src/prefs_other.c:554
+msgid " Choose preset keyboard shortcuts... "
msgstr ""
-#: src/prefs_other.c:562
+#: src/prefs_other.c:567
msgid "Socket I/O timeout"
msgstr ""
-#: src/prefs_other.c:584
+#: src/prefs_other.c:589
msgid "Ask before emptying trash"
msgstr "Ask before emptying wastebin"
-#: src/prefs_other.c:586
+#: src/prefs_other.c:591
msgid "Ask about account specific filtering rules when filtering manually"
msgstr ""
-#: src/prefs_other.c:589
+#: src/prefs_other.c:596
+msgid "Use secure file deletion if possible"
+msgstr ""
+
+#: src/prefs_other.c:600
+msgid ""
+"Use secure file deletion if possible\n"
+"(the 'shred' program is not available)"
+msgstr ""
+
+#: src/prefs_other.c:605
+msgid ""
+"Use the 'shred' program to overwrite files with random data before deleting "
+"them. This slows down deletion. Be sure to read shred's man page for caveats."
+msgstr ""
+
+#: src/prefs_other.c:609
msgid "Synchronise offline folders as soon as possible"
msgstr ""
+#: src/prefs_quote.c:76
+msgid "On %d\\n%f wrote:\\n\\n%q"
+msgstr ""
+
#: src/prefs_receive.c:136
msgid "External incorporation program"
msgstr ""
@@ -11294,10 +10868,6 @@ msgstr ""
msgid "Use external program for receiving mail"
msgstr ""
-#: src/prefs_receive.c:146
-msgid "Command"
-msgstr ""
-
#: src/prefs_receive.c:155
msgid "Automatic checking"
msgstr ""
@@ -11318,7 +10888,7 @@ msgstr "Dialogues"
msgid "Show receive dialog"
msgstr "Show receive dialogue"
-#: src/prefs_receive.c:194 src/prefs_summaries.c:446
+#: src/prefs_receive.c:194 src/prefs_summaries.c:444 src/prefs_summaries.c:463
msgid "Always"
msgstr ""
@@ -11334,478 +10904,472 @@ msgstr "Close receive dialogue when finished"
msgid "Don't popup error dialog on receive error"
msgstr "Don't popup error dialogue on receive error"
-#: src/prefs_receive.c:211
-msgid "After receiving new mail"
+#: src/prefs_receive.c:212
+msgid "After checking for new mail"
msgstr ""
-#: src/prefs_receive.c:213
+#: src/prefs_receive.c:214
msgid "Go to Inbox"
msgstr ""
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:216
msgid "Update all local folders"
msgstr ""
-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:219
msgid "Run command"
msgstr ""
-#: src/prefs_receive.c:223
+#: src/prefs_receive.c:224
msgid "after automatic check"
msgstr ""
-#: src/prefs_receive.c:225
+#: src/prefs_receive.c:226
msgid "after manual check"
msgstr ""
-#: src/prefs_receive.c:233
+#: src/prefs_receive.c:234
#, c-format
msgid ""
"Command to execute:\n"
"(use %d as number of new mails)"
msgstr ""
-#: src/prefs_receive.c:258
+#: src/prefs_receive.c:259
msgid "Blink LED"
msgstr ""
-#: src/prefs_receive.c:259
+#: src/prefs_receive.c:260
msgid "Play sound"
msgstr ""
-#: src/prefs_receive.c:261
+#: src/prefs_receive.c:262
msgid "Show info banner"
msgstr ""
-#: src/prefs_receive.c:395 src/prefs_send.c:353
+#: src/prefs_receive.c:396 src/prefs_send.c:346
msgid "Mail Handling"
msgstr ""
-#: src/prefs_receive.c:396
+#: src/prefs_receive.c:397
msgid "Receiving"
msgstr ""
-#: src/prefs_send.c:160
+#: src/prefs_send.c:159
msgid "Save sent messages to Sent folder"
msgstr ""
-#: src/prefs_send.c:163
+#: src/prefs_send.c:162
msgid "Confirm before sending queued messages"
msgstr ""
-#: src/prefs_send.c:166
+#: src/prefs_send.c:165
msgid "Never send Return Receipts"
msgstr ""
-#: src/prefs_send.c:169
+#: src/prefs_send.c:168
msgid "Show send dialog"
msgstr "Show send dialogue"
-#: src/prefs_send.c:177
+#: src/prefs_send.c:176
msgid "Outgoing encoding"
msgstr ""
-#: src/prefs_send.c:204
+#: src/prefs_send.c:201
msgid ""
"If 'Automatic' is selected, the optimal encoding for the current locale will "
"be used"
msgstr ""
-#: src/prefs_send.c:220
+#: src/prefs_send.c:216
msgid "Automatic (Recommended)"
msgstr ""
-#: src/prefs_send.c:222
+#: src/prefs_send.c:218
msgid "7bit ASCII (US-ASCII)"
msgstr ""
-#: src/prefs_send.c:223
+#: src/prefs_send.c:219
msgid "Unicode (UTF-8)"
msgstr ""
-#: src/prefs_send.c:225
+#: src/prefs_send.c:221
msgid "Western European (ISO-8859-1)"
msgstr ""
-#: src/prefs_send.c:226
+#: src/prefs_send.c:222
msgid "Western European (ISO-8859-15)"
msgstr ""
-#: src/prefs_send.c:228
+#: src/prefs_send.c:224
msgid "Central European (ISO-8859-2)"
msgstr ""
-#: src/prefs_send.c:230
+#: src/prefs_send.c:226
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: src/prefs_send.c:231
+#: src/prefs_send.c:227
msgid "Baltic (ISO-8859-4)"
msgstr ""
-#: src/prefs_send.c:233
+#: src/prefs_send.c:229
msgid "Greek (ISO-8859-7)"
msgstr ""
-#: src/prefs_send.c:235
+#: src/prefs_send.c:231
msgid "Hebrew (ISO-8859-8)"
msgstr ""
-#: src/prefs_send.c:236
+#: src/prefs_send.c:232
msgid "Hebrew (Windows-1255)"
msgstr ""
-#: src/prefs_send.c:238
+#: src/prefs_send.c:234
msgid "Arabic (ISO-8859-6)"
msgstr ""
-#: src/prefs_send.c:239
+#: src/prefs_send.c:235
msgid "Arabic (Windows-1256)"
msgstr ""
-#: src/prefs_send.c:241
+#: src/prefs_send.c:237
msgid "Turkish (ISO-8859-9)"
msgstr ""
-#: src/prefs_send.c:243
+#: src/prefs_send.c:239
msgid "Cyrillic (ISO-8859-5)"
msgstr ""
-#: src/prefs_send.c:244
+#: src/prefs_send.c:240
msgid "Cyrillic (KOI8-R)"
msgstr ""
-#: src/prefs_send.c:245
+#: src/prefs_send.c:241
msgid "Cyrillic (KOI8-U)"
msgstr ""
-#: src/prefs_send.c:246
+#: src/prefs_send.c:242
msgid "Cyrillic (Windows-1251)"
msgstr ""
-#: src/prefs_send.c:248
+#: src/prefs_send.c:244
msgid "Japanese (ISO-2022-JP)"
msgstr ""
-#: src/prefs_send.c:250
+#: src/prefs_send.c:246
msgid "Japanese (EUC-JP)"
msgstr ""
-#: src/prefs_send.c:251
+#: src/prefs_send.c:247
msgid "Japanese (Shift_JIS)"
msgstr ""
-#: src/prefs_send.c:254
+#: src/prefs_send.c:250
msgid "Simplified Chinese (GB2312)"
msgstr ""
-#: src/prefs_send.c:255
+#: src/prefs_send.c:251
msgid "Simplified Chinese (GBK)"
msgstr ""
-#: src/prefs_send.c:256
+#: src/prefs_send.c:252
msgid "Traditional Chinese (Big5)"
msgstr ""
-#: src/prefs_send.c:258
+#: src/prefs_send.c:254
msgid "Traditional Chinese (EUC-TW)"
msgstr ""
-#: src/prefs_send.c:259
+#: src/prefs_send.c:255
msgid "Chinese (ISO-2022-CN)"
msgstr ""
-#: src/prefs_send.c:262
+#: src/prefs_send.c:258
msgid "Korean (EUC-KR)"
msgstr ""
-#: src/prefs_send.c:264
+#: src/prefs_send.c:260
msgid "Thai (TIS-620)"
msgstr ""
-#: src/prefs_send.c:265
+#: src/prefs_send.c:261
msgid "Thai (Windows-874)"
msgstr ""
-#: src/prefs_send.c:269
+#: src/prefs_send.c:265
msgid "Transfer encoding"
msgstr ""
-#: src/prefs_send.c:282
+#: src/prefs_send.c:276
msgid ""
"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
"characters"
msgstr ""
-#: src/prefs_send.c:354 src/send_message.c:477 src/send_message.c:481
-#: src/send_message.c:486
+#: src/prefs_send.c:347 src/send_message.c:464 src/send_message.c:468
+#: src/send_message.c:473
msgid "Sending"
msgstr ""
-#: src/prefs_spelling.c:87
-msgid "Select dictionaries location"
-msgstr ""
-
-#: src/prefs_spelling.c:120
+#: src/prefs_spelling.c:80
msgid "Pick color for misspelled word"
msgstr "Pick colour for misspelled word"
-#: src/prefs_spelling.c:174
+#: src/prefs_spelling.c:126
msgid "Enable spell checker"
msgstr ""
-#: src/prefs_spelling.c:179
+#: src/prefs_spelling.c:131
msgid "Enable alternate dictionary"
msgstr ""
-#: src/prefs_spelling.c:185
+#: src/prefs_spelling.c:136
msgid "Faster switching with last used dictionary"
msgstr ""
-#: src/prefs_spelling.c:187
-msgid "Path to dictionaries"
-msgstr ""
-
-#: src/prefs_spelling.c:202
+#: src/prefs_spelling.c:138
msgid "Automatic spell checking"
msgstr ""
-#: src/prefs_spelling.c:210
+#: src/prefs_spelling.c:146
msgid "Re-check message when changing dictionary"
msgstr ""
-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:150
msgid "Dictionary"
msgstr ""
-#: src/prefs_spelling.c:253
+#: src/prefs_spelling.c:187
msgid "Check with both dictionaries"
msgstr ""
-#: src/prefs_spelling.c:258
-msgid "Default suggestion mode"
-msgstr ""
-
-#: src/prefs_spelling.c:275
+#: src/prefs_spelling.c:196
msgid "Misspelled word color"
msgstr "Misspelled word colour:"
-#: src/prefs_spelling.c:289
+#: src/prefs_spelling.c:209
msgid "Pick color for misspelled word. Use black to underline"
msgstr "Pick colour for misspelled word. Use black to underline"
-#: src/prefs_spelling.c:404
+#: src/prefs_spelling.c:326
msgid "Spell Checking"
msgstr ""
-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:151
msgid "the full abbreviated weekday name"
msgstr ""
-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:152
msgid "the full weekday name"
msgstr ""
-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:153
msgid "the abbreviated month name"
msgstr ""
-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:154
msgid "the full month name"
msgstr ""
-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:155
msgid "the preferred date and time for the current locale"
msgstr ""
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:156
msgid "the century number (year/100)"
msgstr ""
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:157
msgid "the day of the month as a decimal number"
msgstr ""
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:158
msgid "the hour as a decimal number using a 24-hour clock"
msgstr ""
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:159
msgid "the hour as a decimal number using a 12-hour clock"
msgstr ""
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:160
msgid "the day of the year as a decimal number"
msgstr ""
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:161
msgid "the month as a decimal number"
msgstr ""
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:162
msgid "the minute as a decimal number"
msgstr ""
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:163
msgid "either AM or PM"
msgstr ""
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:164
msgid "the second as a decimal number"
msgstr ""
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:165
msgid "the day of the week as a decimal number"
msgstr ""
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:166
msgid "the preferred date for the current locale"
msgstr ""
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:167
msgid "the last two digits of a year"
msgstr ""
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:168
msgid "the year as a decimal number"
msgstr ""
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:169
msgid "the time zone or name or abbreviation"
msgstr ""
-#: src/prefs_summaries.c:188 src/prefs_summaries.c:236
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:190 src/prefs_summaries.c:238
+#: src/prefs_summaries.c:522
msgid "Date format"
msgstr ""
-#: src/prefs_summaries.c:212
+#: src/prefs_summaries.c:214
msgid "Specifier"
msgstr ""
-#: src/prefs_summaries.c:254
+#: src/prefs_summaries.c:256
msgid "Example"
msgstr ""
-#: src/prefs_summaries.c:362
+#: src/prefs_summaries.c:360
msgid "Display message number next to folder name"
msgstr ""
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:369
msgid "No"
msgstr ""
-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:370
msgid "Unread messages"
msgstr ""
-#: src/prefs_summaries.c:373
+#: src/prefs_summaries.c:371
msgid "Unread and Total messages"
msgstr ""
-#: src/prefs_summaries.c:383
+#: src/prefs_summaries.c:381
msgid "Open last opened folder at startup"
msgstr ""
-#: src/prefs_summaries.c:386
+#: src/prefs_summaries.c:384
msgid "Abbreviate newsgroup names longer than"
msgstr ""
-#: src/prefs_summaries.c:400
+#: src/prefs_summaries.c:398
msgid "letters"
msgstr ""
-#: src/prefs_summaries.c:418
+#: src/prefs_summaries.c:416
msgid "Message list"
msgstr ""
-#: src/prefs_summaries.c:424
+#: src/prefs_summaries.c:422
msgid "Set default selection when entering a folder"
msgstr ""
-#: src/prefs_summaries.c:437
+#: src/prefs_summaries.c:435
msgid "Show \"no unread (or new) message\" dialog"
msgstr "Show \"no unread (or new) message\" dialogue"
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:445
msgid "Assume 'Yes'"
msgstr ""
-#: src/prefs_summaries.c:448
+#: src/prefs_summaries.c:446
msgid "Assume 'No'"
msgstr ""
#: src/prefs_summaries.c:454
-msgid "Always open message when selected"
+msgid "Open message when selected"
+msgstr ""
+
+#: src/prefs_summaries.c:464
+msgid "When message view is visible"
msgstr ""
-#: src/prefs_summaries.c:457
+#: src/prefs_summaries.c:470
msgid "Thread using subject in addition to standard headers"
msgstr ""
-#: src/prefs_summaries.c:463
+#: src/prefs_summaries.c:474
msgid "Execute immediately when moving or deleting messages"
msgstr ""
-#: src/prefs_summaries.c:465
+#: src/prefs_summaries.c:476
msgid ""
"Defers moving, copying and deleting of messages until you choose 'Tools/"
"Execute'"
msgstr ""
-#: src/prefs_summaries.c:470
-msgid ""
-"Only mark message as read when opened \n"
-"in a new window, or replied to"
+#: src/prefs_summaries.c:479
+msgid "Mark message as read"
+msgstr ""
+
+#: src/prefs_summaries.c:482
+msgid "when selected, after"
msgstr ""
-#: src/prefs_summaries.c:478
-msgid "Mark messages as read after"
+#: src/prefs_summaries.c:502
+msgid "only when opened in a new window, or replied to"
msgstr ""
-#: src/prefs_summaries.c:494
+#: src/prefs_summaries.c:509
msgid "Display sender using address book"
msgstr ""
-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:513
msgid "Show tooltips"
msgstr ""
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:546
msgid "Date format help"
msgstr ""
-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:564
msgid "Confirm before marking all mails in a folder as read"
msgstr ""
-#: src/prefs_summaries.c:554
+#: src/prefs_summaries.c:567
msgid "Translate header names"
msgstr ""
-#: src/prefs_summaries.c:556
+#: src/prefs_summaries.c:569
msgid ""
"The display of standard headers (such as 'From:', 'Subject:') will be "
"translated into your language."
msgstr ""
-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:686
msgid "Summaries"
msgstr ""
-#: src/prefs_summary_column.c:83 src/summaryview.c:2598
+#: src/prefs_summary_column.c:79 src/summaryview.c:2802
msgid "Attachment"
msgstr ""
-#: src/prefs_summary_column.c:89
+#: src/prefs_summary_column.c:85
msgid "Number"
msgstr ""
-#: src/prefs_summary_column.c:229
+#: src/prefs_summary_column.c:225
msgid "Message list columns configuration"
msgstr ""
-#: src/prefs_summary_column.c:246
+#: src/prefs_summary_column.c:242
msgid ""
"Select columns to be displayed in the message list. You can modify\n"
"the order by using the Up / Down buttons or by dragging the items."
@@ -11847,374 +11411,396 @@ msgstr ""
msgid "Selection on folder opening"
msgstr ""
-#: src/prefs_template.c:211
+#: src/prefs_template.c:78
msgid "This name is used as the Menu item"
msgstr ""
-#: src/prefs_template.c:299
+#: src/prefs_template.c:80
+msgid ""
+"Override composing account's From header. This doesn't change the composing "
+"account."
+msgstr ""
+
+#: src/prefs_template.c:304
msgid "Append the new template above to the list"
msgstr ""
-#: src/prefs_template.c:308
+#: src/prefs_template.c:313
msgid "Replace the selected template in list with the template above"
msgstr ""
-#: src/prefs_template.c:316
+#: src/prefs_template.c:321
msgid "Delete the selected template from the list"
msgstr ""
-#: src/prefs_template.c:329
+#: src/prefs_template.c:334
msgid " Symbols... "
msgstr ""
-#: src/prefs_template.c:336
+#: src/prefs_template.c:341
msgid "Show information on configuring templates"
msgstr ""
-#: src/prefs_template.c:360
+#: src/prefs_template.c:365
msgid "Move the selected template to the top"
msgstr ""
-#: src/prefs_template.c:370
+#: src/prefs_template.c:375
msgid "Move the selected template up"
msgstr ""
-#: src/prefs_template.c:378
+#: src/prefs_template.c:383
msgid "Move the selected template down"
msgstr ""
-#: src/prefs_template.c:388
+#: src/prefs_template.c:393
msgid "Move the selected template to the bottom"
msgstr ""
-#: src/prefs_template.c:404
+#: src/prefs_template.c:409
msgid "Template configuration"
msgstr ""
-#: src/prefs_template.c:545
+#: src/prefs_template.c:596
msgid "Templates list not saved"
msgstr ""
-#: src/prefs_template.c:546
+#: src/prefs_template.c:597
msgid "The templates list has been modified. Close anyway?"
msgstr ""
-#: src/prefs_template.c:671
+#: src/prefs_template.c:749
msgid "Template name is not set."
msgstr ""
-#: src/prefs_template.c:789
+#: src/prefs_template.c:880
msgid "Delete template"
msgstr ""
-#: src/prefs_template.c:790
+#: src/prefs_template.c:881
msgid "Do you really want to delete this template?"
msgstr ""
-#: src/prefs_template.c:803
+#: src/prefs_template.c:894
msgid "Delete all templates"
msgstr ""
-#: src/prefs_template.c:804
+#: src/prefs_template.c:895
msgid "Do you really want to delete all the templates?"
msgstr ""
-#: src/prefs_template.c:1106
+#: src/prefs_template.c:1201
msgid "Current templates"
msgstr ""
-#: src/prefs_template.c:1133
+#: src/prefs_template.c:1229
msgid "Template"
msgstr ""
-#: src/prefs_themes.c:341 src/prefs_themes.c:712
+#: src/prefs_themes.c:343 src/prefs_themes.c:725
msgid "Default internal theme"
msgstr ""
-#: src/prefs_themes.c:363
+#: src/prefs_themes.c:365
msgid "Themes"
msgstr ""
-#: src/prefs_themes.c:450
+#: src/prefs_themes.c:452
msgid "Only root can remove system themes"
msgstr ""
-#: src/prefs_themes.c:453
+#: src/prefs_themes.c:455
#, c-format
msgid "Remove system theme '%s'"
msgstr ""
-#: src/prefs_themes.c:456
+#: src/prefs_themes.c:458
#, c-format
msgid "Remove theme '%s'"
msgstr ""
-#: src/prefs_themes.c:462
+#: src/prefs_themes.c:464
msgid "Are you sure you want to remove this theme?"
msgstr ""
-#: src/prefs_themes.c:472
+#: src/prefs_themes.c:474
#, c-format
msgid ""
"File %s failed\n"
"while removing theme."
msgstr ""
-#: src/prefs_themes.c:476
+#: src/prefs_themes.c:478
msgid "Removing theme directory failed."
msgstr ""
-#: src/prefs_themes.c:479
+#: src/prefs_themes.c:481
msgid "Theme removed successfully"
msgstr ""
-#: src/prefs_themes.c:499
+#: src/prefs_themes.c:501
msgid "Select theme folder"
msgstr ""
-#: src/prefs_themes.c:514
+#: src/prefs_themes.c:516
#, c-format
msgid "Install theme '%s'"
msgstr ""
-#: src/prefs_themes.c:517
+#: src/prefs_themes.c:519
msgid ""
"This folder doesn't seem to be a theme folder.\n"
"Install anyway?"
msgstr ""
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:526
msgid "Do you want to install theme for all users?"
msgstr ""
-#: src/prefs_themes.c:545
+#: src/prefs_themes.c:547
+msgid "Theme exists"
+msgstr ""
+
+#: src/prefs_themes.c:548
msgid ""
"A theme with the same name is\n"
-"already installed in this location"
+"already installed in this location.\n"
+"\n"
+"Do you want to replace it?"
msgstr ""
-#: src/prefs_themes.c:549
-msgid "Couldn't create destination directory"
+#: src/prefs_themes.c:554
+#, c-format
+msgid "Couldn't delete the old theme in %s."
msgstr ""
#: src/prefs_themes.c:562
-msgid "Theme installed successfully"
+#, c-format
+msgid "Couldn't create destination directory %s."
msgstr ""
-#: src/prefs_themes.c:569
+#: src/prefs_themes.c:575
+msgid "Theme installed successfully."
+msgstr ""
+
+#: src/prefs_themes.c:582
msgid "Failed installing theme"
msgstr ""
-#: src/prefs_themes.c:572
+#: src/prefs_themes.c:585
#, c-format
msgid ""
"File %s failed\n"
"while installing theme."
msgstr ""
-#: src/prefs_themes.c:673
+#: src/prefs_themes.c:686
#, c-format
msgid "%d themes available (%d user, %d system, 1 internal)"
msgstr ""
-#: src/prefs_themes.c:715
+#: src/prefs_themes.c:728
#, c-format
msgid "Internal theme has %d icons"
msgstr ""
-#: src/prefs_themes.c:721
+#: src/prefs_themes.c:734
msgid "No info file available for this theme"
msgstr ""
-#: src/prefs_themes.c:739
+#: src/prefs_themes.c:752
msgid "Error: couldn't get theme status"
msgstr ""
-#: src/prefs_themes.c:763
+#: src/prefs_themes.c:776
#, c-format
msgid "%d files (%d icons), size: %s"
msgstr ""
-#: src/prefs_themes.c:846
+#: src/prefs_themes.c:859
msgid "Selector"
msgstr ""
-#: src/prefs_themes.c:857
+#: src/prefs_themes.c:870
msgid "Install new..."
msgstr ""
-#: src/prefs_themes.c:873
+#: src/prefs_themes.c:886
msgid "Information"
msgstr ""
-#: src/prefs_themes.c:887
+#: src/prefs_themes.c:900
msgid "Author: "
msgstr ""
-#: src/prefs_themes.c:895
+#: src/prefs_themes.c:908
msgid "URL:"
msgstr ""
-#: src/prefs_themes.c:937
+#: src/prefs_themes.c:950
msgid "Preview"
msgstr ""
-#: src/prefs_themes.c:987
+#: src/prefs_themes.c:1000
msgid "Use this"
msgstr ""
-#: src/prefs_themes.c:992
+#: src/prefs_themes.c:1005
msgid "Remove"
msgstr ""
-#: src/prefs_toolbar.c:166
+#: src/prefs_toolbar.c:170
msgid ""
"Selected Action already set.\n"
"Please choose another Action from List"
msgstr ""
-#: src/prefs_toolbar.c:167
+#: src/prefs_toolbar.c:171
msgid "Item has no icon defined."
msgstr ""
-#: src/prefs_toolbar.c:168
+#: src/prefs_toolbar.c:172
msgid "Item has no text defined."
msgstr ""
-#: src/prefs_toolbar.c:215
+#: src/prefs_toolbar.c:219
msgid "Main toolbar configuration"
msgstr ""
-#: src/prefs_toolbar.c:216
+#: src/prefs_toolbar.c:220
msgid "Compose toolbar configuration"
msgstr ""
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
msgid "Message view toolbar configuration"
msgstr ""
-#: src/prefs_toolbar.c:797
+#: src/prefs_toolbar.c:801
msgid "Toolbar item"
msgstr ""
-#: src/prefs_toolbar.c:813
+#: src/prefs_toolbar.c:817
msgid "Item type"
msgstr ""
-#: src/prefs_toolbar.c:820
+#: src/prefs_toolbar.c:824
msgid "Internal Function"
msgstr ""
-#: src/prefs_toolbar.c:821
+#: src/prefs_toolbar.c:825
msgid "User Action"
msgstr ""
-#: src/prefs_toolbar.c:821 src/toolbar.c:214
+#: src/prefs_toolbar.c:825 src/toolbar.c:217
msgid "Separator"
msgstr ""
-#: src/prefs_toolbar.c:828
+#: src/prefs_toolbar.c:832
msgid "Event executed on click"
msgstr ""
-#: src/prefs_toolbar.c:848
+#: src/prefs_toolbar.c:852
msgid "Toolbar text"
msgstr ""
-#: src/prefs_toolbar.c:863 src/prefs_toolbar.c:1096
+#: src/prefs_toolbar.c:867 src/prefs_toolbar.c:1100
msgid "Icon"
msgstr ""
-#: src/prefs_toolbar.c:994 src/prefs_toolbar.c:1008 src/prefs_toolbar.c:1022
+#: src/prefs_toolbar.c:998 src/prefs_toolbar.c:1012 src/prefs_toolbar.c:1026
msgid "Customize Toolbars"
msgstr "Customise Toolbars"
-#: src/prefs_toolbar.c:995
+#: src/prefs_toolbar.c:999
msgid "Main Window"
msgstr ""
-#: src/prefs_toolbar.c:1009
+#: src/prefs_toolbar.c:1013
msgid "Message Window"
msgstr ""
-#: src/prefs_toolbar.c:1023
+#: src/prefs_toolbar.c:1027
msgid "Compose Window"
msgstr ""
-#: src/prefs_toolbar.c:1119
+#: src/prefs_toolbar.c:1123
msgid "Icon text"
msgstr ""
-#: src/prefs_toolbar.c:1128
+#: src/prefs_toolbar.c:1132
msgid "Mapped event"
msgstr ""
-#: src/prefs_toolbar.c:1411
+#: src/prefs_toolbar.c:1415
msgid "Toolbar item icon"
msgstr ""
-#: src/prefs_wrapping.c:77
+#: src/prefs_wrapping.c:79
msgid "Auto wrapping"
msgstr ""
-#: src/prefs_wrapping.c:78
+#: src/prefs_wrapping.c:80
msgid "Wrap quotation"
msgstr ""
-#: src/prefs_wrapping.c:79
+#: src/prefs_wrapping.c:81
msgid "Wrap pasted text"
msgstr ""
-#: src/prefs_wrapping.c:85
+#: src/prefs_wrapping.c:82
+msgid "Auto indent"
+msgstr ""
+
+#: src/prefs_wrapping.c:88
msgid "Wrap messages at"
msgstr ""
-#: src/prefs_wrapping.c:145
+#: src/prefs_wrapping.c:153
msgid "Wrapping"
msgstr ""
-#: src/printing.c:386
+#: src/printing.c:398
msgid "First page"
msgstr ""
-#: src/printing.c:387
+#: src/printing.c:399
msgid "Previous page"
msgstr ""
-#: src/printing.c:393
+#: src/printing.c:405
msgid "Next page"
msgstr ""
-#: src/printing.c:394
+#: src/printing.c:406
msgid "Last page"
msgstr ""
-#: src/printing.c:399
+#: src/printing.c:411
msgid "Zoom 100%"
msgstr ""
-#: src/printing.c:400
+#: src/printing.c:412
msgid "Zoom fit"
msgstr ""
-#: src/printing.c:401
+#: src/printing.c:413
msgid "Zoom in"
msgstr ""
-#: src/printing.c:402
+#: src/printing.c:414
msgid "Zoom out"
msgstr ""
-#: src/printing.c:594
+#: src/printing.c:606
#, c-format
msgid "Page %d"
msgstr ""
-#: src/privacy.c:217 src/privacy.c:238
+#: src/privacy.c:239 src/privacy.c:260
msgid "No information available"
msgstr ""
-#: src/privacy.c:440
+#: src/privacy.c:462
msgid "No recipient keys defined."
msgstr ""
@@ -12269,7 +11855,7 @@ msgstr ""
msgid "Error occurred while posting the message to %s."
msgstr ""
-#: src/procmsg.c:2192
+#: src/procmsg.c:2232
msgid "Filtering messages...\n"
msgstr ""
@@ -12346,76 +11932,84 @@ msgid "account property: organization"
msgstr "account property: organisation"
#: src/quote_fmt.c:72
-msgid "account property: default dictionary"
+msgid "account property: signature"
msgstr ""
#: src/quote_fmt.c:73
-msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgid "account property: signature path"
msgstr ""
#: src/quote_fmt.c:74
-msgid "address book <span style=\"oblique\">completion</span>: From"
+msgid "account property: default dictionary"
msgstr ""
#: src/quote_fmt.c:75
-msgid "address book <span style=\"oblique\">completion</span>: To"
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr ""
+
+#: src/quote_fmt.c:76
+msgid "address book <span style=\"oblique\">completion</span>: From"
msgstr ""
#: src/quote_fmt.c:77
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr ""
+
+#: src/quote_fmt.c:79
msgid "literal backslash"
msgstr ""
-#: src/quote_fmt.c:78
+#: src/quote_fmt.c:80
msgid "literal question mark"
msgstr ""
-#: src/quote_fmt.c:79
+#: src/quote_fmt.c:81
msgid "literal exclamation mark"
msgstr ""
-#: src/quote_fmt.c:80
+#: src/quote_fmt.c:82
msgid "literal pipe"
msgstr ""
-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:83
msgid "literal opening curly brace"
msgstr ""
-#: src/quote_fmt.c:82
+#: src/quote_fmt.c:84
msgid "literal closing curly brace"
msgstr ""
-#: src/quote_fmt.c:83
+#: src/quote_fmt.c:85
msgid "tab"
msgstr ""
-#: src/quote_fmt.c:86
+#: src/quote_fmt.c:88
msgid "<span weight=\"bold\">commands:</span>"
msgstr ""
-#: src/quote_fmt.c:87
+#: src/quote_fmt.c:89
msgid ""
"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
-"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
"symbols (or their long equivalent)"
msgstr ""
-#: src/quote_fmt.c:88
+#: src/quote_fmt.c:90
msgid ""
"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
"of\n"
-"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
"symbols (or their long equivalent)"
msgstr ""
-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:91
msgid ""
"insert file:\n"
"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
"to insert"
msgstr ""
-#: src/quote_fmt.c:90
+#: src/quote_fmt.c:92
msgid ""
"insert program output:\n"
"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -12423,37 +12017,37 @@ msgid ""
"the output from"
msgstr ""
-#: src/quote_fmt.c:91
+#: src/quote_fmt.c:93
msgid ""
"insert user input:\n"
"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
"user-entered text"
msgstr ""
-#: src/quote_fmt.c:92
+#: src/quote_fmt.c:94
msgid ""
"attach file:\n"
"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
"to attach"
msgstr ""
-#: src/quote_fmt.c:94
+#: src/quote_fmt.c:96
msgid "<span weight=\"bold\">definition of terms:</span>"
msgstr ""
-#: src/quote_fmt.c:95
+#: src/quote_fmt.c:97
msgid ""
"text that can contain any of the symbols or\n"
"commands above"
msgstr ""
-#: src/quote_fmt.c:96
+#: src/quote_fmt.c:98
msgid ""
"text that can contain any of the symbols (no\n"
"commands) above"
msgstr ""
-#: src/quote_fmt.c:97
+#: src/quote_fmt.c:99
msgid ""
"completion from address book only works with the first\n"
"address of the header, it outputs the full name\n"
@@ -12461,133 +12055,151 @@ msgid ""
"one contact in the address book"
msgstr ""
-#: src/quote_fmt.c:105
+#: src/quote_fmt.c:107
msgid "Description of symbols"
msgstr ""
-#: src/quote_fmt.c:106
+#: src/quote_fmt.c:108
msgid "The following symbols and commands can be used:"
msgstr ""
-#: src/quote_fmt.c:143
+#: src/quote_fmt.c:153
msgid "Use template when composing new messages"
msgstr ""
-#: src/quote_fmt.c:231
+#: src/quote_fmt.c:179
+msgid ""
+"Override From header. This doesn't change the account used to compose the "
+"new message."
+msgstr ""
+
+#: src/quote_fmt.c:281
msgid "Use template when replying to messages"
msgstr ""
-#: src/quote_fmt.c:246 src/quote_fmt.c:338
+#: src/quote_fmt.c:307
+msgid "Override From header. This doesn't change the account used to reply."
+msgstr ""
+
+#: src/quote_fmt.c:318 src/quote_fmt.c:450
msgid "Quotation mark"
msgstr ""
-#: src/quote_fmt.c:323
+#: src/quote_fmt.c:413
msgid "Use template when forwarding messages"
msgstr ""
-#: src/quote_fmt.c:404
+#: src/quote_fmt.c:439
+msgid "Override From header. This doesn't change the account used to forward."
+msgstr ""
+
+#: src/quote_fmt.c:526
msgid "Description of symbols..."
msgstr ""
-#: src/quote_fmt.c:437
+#: src/quote_fmt.c:548
+msgid "Defaults"
+msgstr ""
+
+#: src/quote_fmt.c:586
msgid "Message reply quotation mark format error."
msgstr ""
-#: src/quote_fmt.c:453
+#: src/quote_fmt.c:606
msgid "Message forward quotation mark format error."
msgstr ""
-#: src/quote_fmt_parse.y:504
+#: src/quote_fmt_parse.y:509
#, c-format
msgid "Enter text to replace '%s'"
msgstr ""
-#: src/quote_fmt_parse.y:505
+#: src/quote_fmt_parse.y:510
msgid "Enter variable"
msgstr ""
-#: src/send_message.c:137
+#: src/send_message.c:135
#, c-format
msgid "Sending message using command: %s\n"
msgstr ""
-#: src/send_message.c:151
+#: src/send_message.c:149
#, c-format
msgid "Couldn't execute command: %s"
msgstr ""
-#: src/send_message.c:186
+#: src/send_message.c:184
#, c-format
msgid "Error occurred while executing command: %s"
msgstr ""
-#: src/send_message.c:322
+#: src/send_message.c:312
msgid "Connecting"
msgstr ""
-#: src/send_message.c:327
+#: src/send_message.c:317
msgid "Doing POP before SMTP..."
msgstr ""
-#: src/send_message.c:330
+#: src/send_message.c:320
msgid "POP before SMTP"
msgstr ""
-#: src/send_message.c:335
+#: src/send_message.c:325
#, c-format
msgid "Connecting to SMTP server: %s ..."
msgstr ""
-#: src/send_message.c:395
+#: src/send_message.c:382
msgid "Mail sent successfully."
msgstr ""
-#: src/send_message.c:462
+#: src/send_message.c:449
msgid "Sending HELO..."
msgstr ""
-#: src/send_message.c:463 src/send_message.c:468 src/send_message.c:473
+#: src/send_message.c:450 src/send_message.c:455 src/send_message.c:460
msgid "Authenticating"
msgstr ""
-#: src/send_message.c:464 src/send_message.c:469
+#: src/send_message.c:451 src/send_message.c:456
msgid "Sending message..."
msgstr ""
-#: src/send_message.c:467
+#: src/send_message.c:454
msgid "Sending EHLO..."
msgstr ""
-#: src/send_message.c:476
+#: src/send_message.c:463
msgid "Sending MAIL FROM..."
msgstr ""
-#: src/send_message.c:480
+#: src/send_message.c:467
msgid "Sending RCPT TO..."
msgstr ""
-#: src/send_message.c:485
+#: src/send_message.c:472
msgid "Sending DATA..."
msgstr ""
-#: src/send_message.c:489
+#: src/send_message.c:476
msgid "Quitting..."
msgstr ""
-#: src/send_message.c:518
+#: src/send_message.c:505
#, c-format
msgid "Sending message (%d / %d bytes)"
msgstr ""
-#: src/send_message.c:566
+#: src/send_message.c:553
msgid "Sending message"
msgstr ""
-#: src/send_message.c:624 src/send_message.c:644
+#: src/send_message.c:611 src/send_message.c:631
msgid "Error occurred while sending the message."
msgstr ""
-#: src/send_message.c:627
+#: src/send_message.c:614
#, c-format
msgid ""
"Error occurred while sending the message:\n"
@@ -12606,11 +12218,11 @@ msgid ""
"If you're not sure, just select OK."
msgstr ""
-#: src/sourcewindow.c:69
+#: src/sourcewindow.c:64
msgid "Source of the message"
msgstr ""
-#: src/sourcewindow.c:164
+#: src/sourcewindow.c:159
#, c-format
msgid "%s - Source"
msgstr ""
@@ -12627,531 +12239,410 @@ msgstr ""
msgid "Do you really want to delete this certificate?"
msgstr ""
-#: src/summary_search.c:230
+#: src/summary_search.c:226
msgid "Search messages"
msgstr ""
-#: src/summary_search.c:256
+#: src/summary_search.c:252
msgid "Match any of the following"
msgstr ""
-#: src/summary_search.c:258
+#: src/summary_search.c:254
msgid "Match all of the following"
msgstr ""
-#: src/summary_search.c:377
+#: src/summary_search.c:373
msgid "Body:"
msgstr ""
-#: src/summary_search.c:384
+#: src/summary_search.c:380
msgid "Condition:"
msgstr ""
-#: src/summary_search.c:414
+#: src/summary_search.c:410
msgid "Find _all"
msgstr ""
-#: src/summary_search.c:675
+#: src/summary_search.c:671
msgid "Beginning of list reached; continue from end?"
msgstr ""
-#: src/summary_search.c:677
+#: src/summary_search.c:673
msgid "End of list reached; continue from beginning?"
msgstr ""
-#: src/summaryview.c:460
-msgid "/_Reply"
-msgstr ""
-
-#: src/summaryview.c:462
-msgid "/Repl_y to"
-msgstr ""
-
-#: src/summaryview.c:463
-msgid "/Repl_y to/_all"
-msgstr ""
-
-#: src/summaryview.c:464
-msgid "/Repl_y to/_sender"
-msgstr ""
-
-#: src/summaryview.c:465
-msgid "/Repl_y to/mailing _list"
-msgstr ""
-
-#: src/summaryview.c:469 src/toolbar.c:253
-msgid "/_Forward"
-msgstr ""
-
-#: src/summaryview.c:471 src/toolbar.c:254
-msgid "/For_ward as attachment"
-msgstr ""
-
-#: src/summaryview.c:472
-msgid "/Redirect"
-msgstr ""
-
-#: src/summaryview.c:475
-msgid "/M_ove..."
-msgstr ""
-
-#: src/summaryview.c:476
-msgid "/_Copy..."
-msgstr ""
-
-#: src/summaryview.c:477
-msgid "/Move to _trash"
-msgstr "/Move to was_tebin"
-
-#: src/summaryview.c:479
-msgid "/_Delete..."
-msgstr ""
-
-#: src/summaryview.c:482
-msgid "/_Mark"
-msgstr ""
-
-#: src/summaryview.c:483
-msgid "/_Mark/_Mark"
+#: src/summaryview.c:516
+msgid "_mailing list"
msgstr ""
-#: src/summaryview.c:484
-msgid "/_Mark/_Unmark"
+#: src/summaryview.c:561
+msgid "Create f_ilter rule"
msgstr ""
-#: src/summaryview.c:485 src/summaryview.c:493 src/summaryview.c:496
-msgid "/_Mark/---"
+#: src/summaryview.c:578
+msgid "Message _source"
msgstr ""
-#: src/summaryview.c:486
-msgid "/_Mark/Mark as unr_ead"
+#: src/summaryview.c:582
+msgid "Print..."
msgstr ""
-#: src/summaryview.c:487
-msgid "/_Mark/Mark as rea_d"
+#: src/summaryview.c:589
+msgid "All _headers"
msgstr ""
-#: src/summaryview.c:488
-msgid "/_Mark/Mark all read"
-msgstr ""
-
-#: src/summaryview.c:489
-msgid "/_Mark/Ignore thread"
-msgstr ""
-
-#: src/summaryview.c:490
-msgid "/_Mark/Unignore thread"
-msgstr ""
-
-#: src/summaryview.c:491
-msgid "/_Mark/Watch thread"
-msgstr ""
-
-#: src/summaryview.c:492
-msgid "/_Mark/Unwatch thread"
-msgstr ""
-
-#: src/summaryview.c:494
-msgid "/_Mark/Mark as _spam"
-msgstr ""
-
-#: src/summaryview.c:495
-msgid "/_Mark/Mark as _ham"
-msgstr ""
-
-#: src/summaryview.c:497
-msgid "/_Mark/Lock"
-msgstr ""
-
-#: src/summaryview.c:498
-msgid "/_Mark/Unlock"
-msgstr ""
-
-#: src/summaryview.c:499
-msgid "/Color la_bel"
-msgstr "Colour la_bel"
-
-#: src/summaryview.c:500
-msgid "/Ta_gs"
-msgstr ""
-
-#: src/summaryview.c:504
-msgid "/Add sender to address boo_k"
-msgstr ""
-
-#: src/summaryview.c:507
-msgid "/Create f_ilter rule"
-msgstr ""
-
-#: src/summaryview.c:508
-msgid "/Create f_ilter rule/_Automatically"
-msgstr ""
-
-#: src/summaryview.c:510
-msgid "/Create f_ilter rule/by _From"
-msgstr ""
-
-#: src/summaryview.c:512
-msgid "/Create f_ilter rule/by _To"
-msgstr ""
-
-#: src/summaryview.c:514
-msgid "/Create f_ilter rule/by _Subject"
-msgstr ""
-
-#: src/summaryview.c:517
-msgid "/Create processing rule"
-msgstr ""
-
-#: src/summaryview.c:518
-msgid "/Create processing rule/_Automatically"
-msgstr ""
-
-#: src/summaryview.c:520
-msgid "/Create processing rule/by _From"
-msgstr ""
-
-#: src/summaryview.c:522
-msgid "/Create processing rule/by _To"
-msgstr ""
-
-#: src/summaryview.c:524
-msgid "/Create processing rule/by _Subject"
-msgstr ""
-
-#: src/summaryview.c:531
-msgid "/_View/Message _source"
-msgstr ""
-
-#: src/summaryview.c:533
-msgid "/_View/All _headers"
-msgstr ""
-
-#: src/summaryview.c:536
-msgid "/_Save as..."
-msgstr ""
-
-#: src/summaryview.c:538
-msgid "/_Print..."
-msgstr ""
-
-#: src/summaryview.c:660
+#: src/summaryview.c:709
msgid "Toggle quick search bar"
msgstr ""
-#: src/summaryview.c:698
+#: src/summaryview.c:746
msgid "Toggle multiple selection"
msgstr ""
-#: src/summaryview.c:1178
+#: src/summaryview.c:1341
msgid "Process mark"
msgstr ""
-#: src/summaryview.c:1179
+#: src/summaryview.c:1342
msgid "Some marks are left. Process them?"
msgstr ""
-#: src/summaryview.c:1236
+#: src/summaryview.c:1399
#, c-format
msgid "Scanning folder (%s)..."
msgstr ""
-#: src/summaryview.c:1717 src/summaryview.c:1769
+#: src/summaryview.c:1878 src/summaryview.c:1930
msgid "No more unread messages"
msgstr ""
-#: src/summaryview.c:1718
+#: src/summaryview.c:1879
msgid "No unread message found. Search from the end?"
msgstr ""
-#: src/summaryview.c:1730 src/summaryview.c:1782 src/summaryview.c:1829
-#: src/summaryview.c:1881 src/summaryview.c:1960
+#: src/summaryview.c:1891 src/summaryview.c:1943 src/summaryview.c:1990
+#: src/summaryview.c:2042 src/summaryview.c:2121
msgid ""
"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
msgstr ""
-#: src/summaryview.c:1738
+#: src/summaryview.c:1899
msgid "No unread messages."
msgstr ""
-#: src/summaryview.c:1770
+#: src/summaryview.c:1931
msgid "No unread message found. Go to next folder?"
msgstr ""
-#: src/summaryview.c:1816 src/summaryview.c:1868
+#: src/summaryview.c:1977 src/summaryview.c:2029
msgid "No more new messages"
msgstr ""
-#: src/summaryview.c:1817
+#: src/summaryview.c:1978
msgid "No new message found. Search from the end?"
msgstr ""
-#: src/summaryview.c:1837
+#: src/summaryview.c:1998
msgid "No new messages."
msgstr ""
-#: src/summaryview.c:1869
+#: src/summaryview.c:2030
msgid "No new message found. Go to next folder?"
msgstr ""
-#: src/summaryview.c:1906 src/summaryview.c:1947
+#: src/summaryview.c:2067 src/summaryview.c:2108
msgid "No more marked messages"
msgstr ""
-#: src/summaryview.c:1907
+#: src/summaryview.c:2068
msgid "No marked message found. Search from the end?"
msgstr ""
-#: src/summaryview.c:1916
+#: src/summaryview.c:2077
msgid "No marked messages."
msgstr ""
-#: src/summaryview.c:1948
+#: src/summaryview.c:2109
msgid "No marked message found. Go to next folder?"
msgstr ""
-#: src/summaryview.c:1985 src/summaryview.c:2010
+#: src/summaryview.c:2146 src/summaryview.c:2171
msgid "No more labeled messages"
msgstr "No more labelled messages"
-#: src/summaryview.c:1986
+#: src/summaryview.c:2147
msgid "No labeled message found. Search from the end?"
msgstr "No labelled message found. Search from the end?"
-#: src/summaryview.c:1995 src/summaryview.c:2020
+#: src/summaryview.c:2156 src/summaryview.c:2181
msgid "No labeled messages."
msgstr "No labelled messages."
-#: src/summaryview.c:2011
+#: src/summaryview.c:2172
msgid "No labeled message found. Search from the beginning?"
msgstr "No labelled message found. Search from the beginning?"
-#: src/summaryview.c:2302
+#: src/summaryview.c:2463
msgid "Attracting messages by subject..."
msgstr ""
-#: src/summaryview.c:2463
+#: src/summaryview.c:2646
#, c-format
msgid "%d deleted"
msgstr ""
-#: src/summaryview.c:2467
+#: src/summaryview.c:2650
#, c-format
msgid "%s%d moved"
msgstr ""
-#: src/summaryview.c:2468 src/summaryview.c:2475
+#: src/summaryview.c:2651 src/summaryview.c:2658
msgid ", "
msgstr ""
-#: src/summaryview.c:2473
+#: src/summaryview.c:2656
#, c-format
msgid "%s%d copied"
msgstr ""
-#: src/summaryview.c:2488
+#: src/summaryview.c:2671
msgid " item selected"
msgstr ""
-#: src/summaryview.c:2490
+#: src/summaryview.c:2673
msgid " items selected"
msgstr ""
-#: src/summaryview.c:2508 src/summaryview.c:2525
+#: src/summaryview.c:2691 src/summaryview.c:2729
#, c-format
msgid "%d new, %d unread, %d total (%s)"
msgstr ""
-#: src/summaryview.c:2520
+#: src/summaryview.c:2699
+#, c-format
+msgid ""
+"<b>Message summary</b>\n"
+"<b>New:</b> %d\n"
+"<b>Unread:</b> %d\n"
+"<b>Total:</b> %d\n"
+"<b>Size:</b> %s\n"
+"\n"
+"<b>Marked:</b> %d\n"
+"<b>Replied:</b> %d\n"
+"<b>Forwarded:</b> %d\n"
+"<b>Locked:</b> %d\n"
+"<b>Ignored:</b> %d\n"
+"<b>Watched:</b> %d"
+msgstr ""
+
+#: src/summaryview.c:2724
#, c-format
msgid "%d/%d selected (%s/%s), %d unread"
msgstr ""
-#: src/summaryview.c:2792
+#: src/summaryview.c:2997
msgid "Sorting summary..."
msgstr ""
-#: src/summaryview.c:2900
+#: src/summaryview.c:3111
msgid "Setting summary from message data..."
msgstr ""
-#: src/summaryview.c:3094
+#: src/summaryview.c:3315
msgid "(No Date)"
msgstr ""
-#: src/summaryview.c:3131
+#: src/summaryview.c:3352
msgid "(No Recipient)"
msgstr ""
-#: src/summaryview.c:3989
+#: src/summaryview.c:3375
+#, c-format
+msgid ""
+"%s\n"
+"<span color='%s' style='italic'>From: %s, on %s</span>"
+msgstr ""
+
+#: src/summaryview.c:3382
+#, c-format
+msgid ""
+"%s\n"
+"<span color='%s' style='italic'>To: %s, on %s</span>"
+msgstr ""
+
+#: src/summaryview.c:4245
msgid "You're not the author of the article.\n"
msgstr ""
-#: src/summaryview.c:4077
+#: src/summaryview.c:4333
#, c-format
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the %d selected messages?"
msgstr[0] ""
msgstr[1] ""
-#: src/summaryview.c:4080
+#: src/summaryview.c:4336
msgid "Delete message(s)"
msgstr ""
-#: src/summaryview.c:4237
+#: src/summaryview.c:4493
msgid "Destination is same as current folder."
msgstr ""
-#: src/summaryview.c:4334
+#: src/summaryview.c:4592
msgid "Destination to copy is same as current folder."
msgstr ""
-#: src/summaryview.c:4499
+#: src/summaryview.c:4757
msgid "Append or Overwrite"
msgstr ""
-#: src/summaryview.c:4500
+#: src/summaryview.c:4758
msgid "Append or overwrite existing file?"
msgstr ""
-#: src/summaryview.c:4501
+#: src/summaryview.c:4759
msgid "_Append"
msgstr ""
-#: src/summaryview.c:4501
+#: src/summaryview.c:4759
msgid "_Overwrite"
msgstr ""
-#: src/summaryview.c:4548
+#: src/summaryview.c:4806
#, c-format
msgid ""
"You are about to print %d messages, one by one. Do you want to continue?"
msgstr ""
-#: src/summaryview.c:4869
+#: src/summaryview.c:5127
msgid "Building threads..."
msgstr ""
-#: src/summaryview.c:5088
+#: src/summaryview.c:5346
msgid "Skip these rules"
msgstr ""
-#: src/summaryview.c:5091
+#: src/summaryview.c:5349
msgid "Apply these rules regardless of the account they belong to"
msgstr ""
-#: src/summaryview.c:5094
+#: src/summaryview.c:5352
msgid "Apply these rules if they apply to the current account"
msgstr ""
-#: src/summaryview.c:5123
+#: src/summaryview.c:5381
msgid "Filtering"
msgstr ""
-#: src/summaryview.c:5124
+#: src/summaryview.c:5382
msgid ""
"There are some filtering rules that belong to an account.\n"
"Please choose what to do with these rules:"
msgstr ""
-#: src/summaryview.c:5126
+#: src/summaryview.c:5384
msgid "_Filter"
msgstr ""
-#: src/summaryview.c:5154
+#: src/summaryview.c:5412
msgid "Filtering..."
msgstr ""
-#: src/summaryview.c:5233
+#: src/summaryview.c:5491
msgid "Processing configuration"
msgstr ""
-#: src/summaryview.c:5758
+#: src/summaryview.c:6029
msgid "Ignored thread"
msgstr ""
-#: src/summaryview.c:5760
+#: src/summaryview.c:6031
msgid "Watched thread"
msgstr ""
-#: src/summaryview.c:5768
+#: src/summaryview.c:6039
msgid "Replied - click to see reply"
msgstr ""
-#: src/summaryview.c:5780
+#: src/summaryview.c:6051
msgid "To be moved"
msgstr ""
-#: src/summaryview.c:5782
+#: src/summaryview.c:6053
msgid "To be copied"
msgstr ""
-#: src/summaryview.c:5794
+#: src/summaryview.c:6065
msgid "Signed, has attachment(s)"
msgstr ""
-#: src/summaryview.c:5796
+#: src/summaryview.c:6067
msgid "Signed"
msgstr ""
-#: src/summaryview.c:5798
+#: src/summaryview.c:6069
msgid "Encrypted, has attachment(s)"
msgstr ""
-#: src/summaryview.c:5800
+#: src/summaryview.c:6071
msgid "Encrypted"
msgstr ""
-#: src/summaryview.c:5802
+#: src/summaryview.c:6073
msgid "Has attachment(s)"
msgstr ""
-#: src/summaryview.c:7297
+#: src/summaryview.c:7655
#, c-format
msgid ""
"Regular expression (regexp) error:\n"
"%s"
msgstr ""
-#: src/summaryview.c:7400
+#: src/summaryview.c:7762
msgid "Go back to the folder list (You have unread messages)"
msgstr ""
-#: src/summaryview.c:7406
+#: src/summaryview.c:7767
msgid "Go back to the folder list"
msgstr ""
-#: src/textview.c:221
-msgid "/Compose _new message"
+#: src/textview.c:207
+msgid "_Open in web browser"
msgstr ""
-#: src/textview.c:222
-msgid "/Add to _address book"
+#: src/textview.c:208
+msgid "Copy this _link"
msgstr ""
-#: src/textview.c:223
-msgid "/Copy this add_ress"
+#: src/textview.c:215
+msgid "Add to _Address book"
+msgstr ""
+
+#: src/textview.c:216
+msgid "Copy this add_ress"
msgstr ""
-#: src/textview.c:228
-msgid "/_Open image"
+#: src/textview.c:222
+msgid "_Open image"
msgstr ""
-#: src/textview.c:229
-msgid "/_Save image..."
+#: src/textview.c:223
+msgid "_Save image..."
msgstr ""
-#: src/textview.c:662
+#: src/textview.c:659
#, c-format
msgid "[%s %s (%d bytes)]"
msgstr ""
-#: src/textview.c:665
+#: src/textview.c:662
#, c-format
msgid "[%s (%d bytes)]"
msgstr ""
-#: src/textview.c:841
+#: src/textview.c:838
msgid ""
"\n"
" This message can't be displayed.\n"
@@ -13160,79 +12651,79 @@ msgid ""
" Use "
msgstr ""
-#: src/textview.c:846
+#: src/textview.c:843
msgid "'View Log'"
msgstr ""
-#: src/textview.c:847
+#: src/textview.c:844
msgid " in the Tools menu for more information."
msgstr ""
-#: src/textview.c:887
+#: src/textview.c:884
msgid " The following can be performed on this part\n"
msgstr ""
-#: src/textview.c:889
+#: src/textview.c:886
msgid " by right-clicking the icon or list item:"
msgstr ""
-#: src/textview.c:893
+#: src/textview.c:890
msgid " - To save, select "
msgstr ""
-#: src/textview.c:894
+#: src/textview.c:891
msgid "'Save as...'"
msgstr ""
-#: src/textview.c:896
+#: src/textview.c:893
msgid " (Shortcut key: 'y')"
msgstr ""
-#: src/textview.c:900
+#: src/textview.c:897
msgid " - To display as text, select "
msgstr ""
-#: src/textview.c:901
+#: src/textview.c:898
msgid "'Display as text'"
msgstr ""
-#: src/textview.c:904
+#: src/textview.c:901
msgid " (Shortcut key: 't')"
msgstr ""
-#: src/textview.c:908
+#: src/textview.c:905
msgid " - To open with an external program, select "
msgstr ""
-#: src/textview.c:909
+#: src/textview.c:906
msgid "'Open'"
msgstr ""
-#: src/textview.c:912
+#: src/textview.c:909
msgid " (Shortcut key: 'l')\n"
msgstr ""
-#: src/textview.c:913
+#: src/textview.c:910
msgid " (alternately double-click, or click the middle "
msgstr ""
-#: src/textview.c:914
+#: src/textview.c:911
msgid "mouse button)\n"
msgstr ""
-#: src/textview.c:915
+#: src/textview.c:912
msgid " - Or use "
msgstr ""
-#: src/textview.c:916
+#: src/textview.c:913
msgid "'Open with...'"
msgstr ""
-#: src/textview.c:917
+#: src/textview.c:914
msgid " (Shortcut key: 'o')"
msgstr ""
-#: src/textview.c:1008
+#: src/textview.c:1010
#, c-format
msgid ""
"The command to view attachment as text failed:\n"
@@ -13240,11 +12731,11 @@ msgid ""
"Exit code %d\n"
msgstr ""
-#: src/textview.c:2068
+#: src/textview.c:2083
msgid "Tags: "
msgstr ""
-#: src/textview.c:2752
+#: src/textview.c:2769
#, c-format
msgid ""
"The real URL is different from the displayed URL.\n"
@@ -13256,283 +12747,259 @@ msgid ""
"Open it anyway?"
msgstr ""
-#: src/textview.c:2761
+#: src/textview.c:2778
msgid "Phishing attempt warning"
msgstr ""
-#: src/textview.c:2762
+#: src/textview.c:2779
msgid "_Open URL"
msgstr ""
-#: src/toolbar.c:176 src/toolbar.c:1859
+#: src/toolbar.c:178 src/toolbar.c:1876
msgid "Receive Mail on all Accounts"
msgstr ""
-#: src/toolbar.c:177 src/toolbar.c:1864
+#: src/toolbar.c:179 src/toolbar.c:1881
msgid "Receive Mail on current Account"
msgstr ""
-#: src/toolbar.c:178 src/toolbar.c:1868
+#: src/toolbar.c:180 src/toolbar.c:1885
msgid "Send Queued Messages"
msgstr ""
-#: src/toolbar.c:179 src/toolbar.c:894 src/toolbar.c:1882 src/toolbar.c:1893
+#: src/toolbar.c:181 src/toolbar.c:888 src/toolbar.c:1903 src/toolbar.c:1914
msgid "Compose Email"
msgstr ""
-#: src/toolbar.c:180
+#: src/toolbar.c:182
msgid "Compose News"
msgstr ""
-#: src/toolbar.c:181 src/toolbar.c:1918 src/toolbar.c:1925
+#: src/toolbar.c:183 src/toolbar.c:1942 src/toolbar.c:1952
msgid "Reply to Message"
msgstr ""
-#: src/toolbar.c:182 src/toolbar.c:1932 src/toolbar.c:1939
+#: src/toolbar.c:184 src/toolbar.c:1959 src/toolbar.c:1969
msgid "Reply to Sender"
msgstr ""
-#: src/toolbar.c:183 src/toolbar.c:1946 src/toolbar.c:1953
+#: src/toolbar.c:185 src/toolbar.c:1976 src/toolbar.c:1986
msgid "Reply to All"
msgstr ""
-#: src/toolbar.c:184 src/toolbar.c:1960 src/toolbar.c:1967
+#: src/toolbar.c:186 src/toolbar.c:1993 src/toolbar.c:2003
msgid "Reply to Mailing-list"
msgstr ""
-#: src/toolbar.c:185 src/toolbar.c:1876
+#: src/toolbar.c:187 src/toolbar.c:1897
msgid "Open email"
msgstr ""
-#: src/toolbar.c:186 src/toolbar.c:1974 src/toolbar.c:1981
+#: src/toolbar.c:188 src/toolbar.c:2010 src/toolbar.c:2021
msgid "Forward Message"
msgstr ""
-#: src/toolbar.c:187 src/toolbar.c:1986
+#: src/toolbar.c:189 src/toolbar.c:2026
msgid "Trash Message"
msgstr "Move Message to Wastebin"
-#: src/toolbar.c:188 src/toolbar.c:1990
+#: src/toolbar.c:190 src/toolbar.c:2030
msgid "Delete Message"
msgstr ""
-#: src/toolbar.c:190 src/toolbar.c:1998
+#: src/toolbar.c:192 src/toolbar.c:2038
msgid "Go to Previous Unread Message"
msgstr ""
-#: src/toolbar.c:191 src/toolbar.c:2002
+#: src/toolbar.c:193 src/toolbar.c:2042
msgid "Go to Next Unread Message"
msgstr ""
-#: src/toolbar.c:195
+#: src/toolbar.c:197
msgid "Learn Spam or Ham"
msgstr ""
-#: src/toolbar.c:196
+#: src/toolbar.c:198
msgid "Open folder/Go to folder list"
msgstr ""
-#: src/toolbar.c:198 src/toolbar.c:2008
+#: src/toolbar.c:201 src/toolbar.c:2048
msgid "Send Message"
msgstr ""
-#: src/toolbar.c:199 src/toolbar.c:2012
+#: src/toolbar.c:202 src/toolbar.c:2052
msgid "Put into queue folder and send later"
msgstr ""
-#: src/toolbar.c:200 src/toolbar.c:2016
+#: src/toolbar.c:203 src/toolbar.c:2056
msgid "Save to draft folder"
msgstr ""
-#: src/toolbar.c:201 src/toolbar.c:2020
+#: src/toolbar.c:204 src/toolbar.c:2060
msgid "Insert file"
msgstr ""
-#: src/toolbar.c:202 src/toolbar.c:2024
+#: src/toolbar.c:205 src/toolbar.c:2064
msgid "Attach file"
msgstr ""
-#: src/toolbar.c:203 src/toolbar.c:2028
+#: src/toolbar.c:206 src/toolbar.c:2068
msgid "Insert signature"
msgstr ""
-#: src/toolbar.c:204 src/toolbar.c:2032
+#: src/toolbar.c:207 src/toolbar.c:2072
msgid "Edit with external editor"
msgstr ""
-#: src/toolbar.c:205 src/toolbar.c:2036
+#: src/toolbar.c:208 src/toolbar.c:2076
msgid "Wrap long lines of current paragraph"
msgstr ""
-#: src/toolbar.c:206 src/toolbar.c:2040
+#: src/toolbar.c:209 src/toolbar.c:2080
msgid "Wrap all long lines"
msgstr ""
-#: src/toolbar.c:209 src/toolbar.c:449 src/toolbar.c:2049
+#: src/toolbar.c:212 src/toolbar.c:419 src/toolbar.c:2089
msgid "Check spelling"
msgstr ""
-#: src/toolbar.c:211
+#: src/toolbar.c:214
msgid "Claws Mail Actions Feature"
msgstr ""
-#: src/toolbar.c:212 src/toolbar.c:2065
+#: src/toolbar.c:215 src/toolbar.c:2105
msgid "Cancel receiving"
msgstr ""
-#: src/toolbar.c:213 src/toolbar.c:1872
+#: src/toolbar.c:216 src/toolbar.c:1889
msgid "Close window"
msgstr ""
-#: src/toolbar.c:233
-msgid "/Reply with _quote"
-msgstr ""
-
-#: src/toolbar.c:234
-msgid "/_Reply without quote"
-msgstr ""
-
-#: src/toolbar.c:238
-msgid "/Reply to all with _quote"
-msgstr ""
-
-#: src/toolbar.c:239
-msgid "/_Reply to all without quote"
-msgstr ""
-
-#: src/toolbar.c:243
-msgid "/Reply to list with _quote"
-msgstr ""
-
-#: src/toolbar.c:244
-msgid "/_Reply to list without quote"
-msgstr ""
-
-#: src/toolbar.c:248
-msgid "/Reply to sender with _quote"
-msgstr ""
-
-#: src/toolbar.c:249
-msgid "/_Reply to sender without quote"
-msgstr ""
-
-#: src/toolbar.c:255
-msgid "/Redirec_t"
-msgstr ""
-
-#: src/toolbar.c:260
-msgid "/Learn as _Spam"
-msgstr ""
-
-#: src/toolbar.c:261
-msgid "/Learn as _Ham"
-msgstr ""
-
-#: src/toolbar.c:416
+#: src/toolbar.c:385
msgid "Open"
msgstr ""
-#: src/toolbar.c:417
+#: src/toolbar.c:386
msgid "Get Mail"
msgstr ""
-#: src/toolbar.c:418
+#: src/toolbar.c:387
msgid "Get"
msgstr ""
-#: src/toolbar.c:420 src/toolbar.c:421
+#: src/toolbar.c:389 src/toolbar.c:390
msgid "Toolbar|Compose"
msgstr ""
-#: src/toolbar.c:423
+#: src/toolbar.c:392
msgid "All"
msgstr ""
-#: src/toolbar.c:425
+#: src/toolbar.c:394
msgid "List"
msgstr ""
-#: src/toolbar.c:430
+#: src/toolbar.c:399
msgid "Prev"
msgstr ""
-#: src/toolbar.c:431
+#: src/toolbar.c:400
msgid "Next"
msgstr ""
-#: src/toolbar.c:438
+#: src/toolbar.c:408
msgid "Draft"
msgstr ""
-#: src/toolbar.c:441
+#: src/toolbar.c:411
msgid "Insert sig."
msgstr ""
-#: src/toolbar.c:442
+#: src/toolbar.c:412
msgid "Edit"
msgstr ""
-#: src/toolbar.c:443
+#: src/toolbar.c:413
msgid "Wrap para."
msgstr ""
-#: src/toolbar.c:444
+#: src/toolbar.c:414
msgid "Wrap all"
msgstr ""
-#: src/toolbar.c:446
+#: src/toolbar.c:416
msgid "Stop"
msgstr ""
-#: src/toolbar.c:885
+#: src/toolbar.c:880
msgid "Compose News message"
msgstr ""
-#: src/toolbar.c:926
+#: src/toolbar.c:922
msgid "Learn spam"
msgstr ""
-#: src/toolbar.c:935
+#: src/toolbar.c:931
msgid "Ham"
msgstr ""
-#: src/toolbar.c:938
+#: src/toolbar.c:933
msgid "Learn ham"
msgstr ""
-#: src/toolbar.c:1854
+#: src/toolbar.c:1871
msgid "Go to folder list"
msgstr ""
-#: src/toolbar.c:1860
+#: src/toolbar.c:1877
msgid "Receive Mail on selected Account"
msgstr ""
-#: src/toolbar.c:1883
-msgid "Compose with selected Account"
+#: src/toolbar.c:1893
+msgid "Open preferences"
msgstr ""
#: src/toolbar.c:1904
+msgid "Compose with selected Account"
+msgstr ""
+
+#: src/toolbar.c:1925
msgid "Learn as..."
msgstr ""
-#: src/toolbar.c:1919
+#: src/toolbar.c:1935
+msgid "Learn as _Spam"
+msgstr ""
+
+#: src/toolbar.c:1936
+msgid "Learn as _Ham"
+msgstr ""
+
+#: src/toolbar.c:1943
msgid "Reply to Message options"
msgstr ""
-#: src/toolbar.c:1933
+#: src/toolbar.c:1947 src/toolbar.c:1964 src/toolbar.c:1981 src/toolbar.c:1998
+msgid "_Reply with quote"
+msgstr ""
+
+#: src/toolbar.c:1948 src/toolbar.c:1965 src/toolbar.c:1982 src/toolbar.c:1999
+msgid "Reply without _quote"
+msgstr ""
+
+#: src/toolbar.c:1960
msgid "Reply to Sender options"
msgstr ""
-#: src/toolbar.c:1947
+#: src/toolbar.c:1977
msgid "Reply to All options"
msgstr ""
-#: src/toolbar.c:1961
+#: src/toolbar.c:1994
msgid "Reply to Mailing-list options"
msgstr ""
-#: src/toolbar.c:1975
+#: src/toolbar.c:2011
msgid "Forward Message options"
msgstr ""
@@ -13556,11 +13023,11 @@ msgstr ""
msgid "Select All"
msgstr ""
-#: src/wizard.c:496
+#: src/wizard.c:536
msgid "Welcome Mail Subject|Welcome to Claws Mail"
msgstr ""
-#: src/wizard.c:519
+#: src/wizard.c:559
#, c-format
msgid ""
"\n"
@@ -13609,159 +13076,163 @@ msgid ""
"\n"
msgstr ""
-#: src/wizard.c:595
+#: src/wizard.c:635
msgid "Please enter the mailbox name."
msgstr ""
-#: src/wizard.c:638
+#: src/wizard.c:678
msgid "Please enter your name and email address."
msgstr ""
-#: src/wizard.c:649
+#: src/wizard.c:689
msgid "Please enter your receiving server and username."
msgstr ""
-#: src/wizard.c:659
+#: src/wizard.c:699
msgid "Please enter your username."
msgstr ""
-#: src/wizard.c:669
+#: src/wizard.c:709
msgid "Please enter your SMTP server."
msgstr ""
-#: src/wizard.c:680
+#: src/wizard.c:720
msgid "Please enter your SMTP username."
msgstr ""
-#: src/wizard.c:961
+#: src/wizard.c:1009
msgid "<span weight=\"bold\">Your name:</span>"
msgstr ""
-#: src/wizard.c:968
+#: src/wizard.c:1016
msgid "<span weight=\"bold\">Your email address:</span>"
msgstr ""
-#: src/wizard.c:975
+#: src/wizard.c:1023
msgid "Your organization:"
msgstr "Your organisation:"
-#: src/wizard.c:1077
+#: src/wizard.c:1125
msgid "<span weight=\"bold\">Mailbox name:</span>"
msgstr ""
-#: src/wizard.c:1086
+#: src/wizard.c:1133
msgid ""
"You can also specify an absolute path, for example: \"/home/john/Documents/"
"Mail\""
msgstr ""
-#: src/wizard.c:1095
+#: src/wizard.c:1141
msgid "on internal memory"
msgstr ""
-#: src/wizard.c:1098
+#: src/wizard.c:1144
msgid "on external memory card"
msgstr ""
-#: src/wizard.c:1101
+#: src/wizard.c:1147
msgid "on internal memory card"
msgstr ""
-#: src/wizard.c:1151
+#: src/wizard.c:1197
msgid "<span weight=\"bold\">Store data</span>"
msgstr ""
-#: src/wizard.c:1194
+#: src/wizard.c:1265
msgid ""
"You can specify the port number by appending it at the end: \"mail.example."
"com:25\""
msgstr ""
-#: src/wizard.c:1198
+#: src/wizard.c:1268
msgid "<span weight=\"bold\">SMTP server address:</span>"
msgstr ""
-#: src/wizard.c:1205
+#: src/wizard.c:1275
msgid "Use authentication"
msgstr ""
-#: src/wizard.c:1220
+#: src/wizard.c:1290
msgid ""
"SMTP username:\n"
"<span size=\"small\">(empty to use the same as receive)</span>"
msgstr ""
-#: src/wizard.c:1237
+#: src/wizard.c:1307
msgid ""
"SMTP password:\n"
"<span size=\"small\">(empty to use the same as receive)</span>"
msgstr ""
-#: src/wizard.c:1248
+#: src/wizard.c:1318
msgid "Use SSL to connect to SMTP server"
msgstr ""
-#: src/wizard.c:1256 src/wizard.c:1478
+#: src/wizard.c:1326 src/wizard.c:1589
msgid "Use SSL via STARTTLS"
msgstr ""
-#: src/wizard.c:1285 src/wizard.c:1309 src/wizard.c:1430
+#: src/wizard.c:1335 src/wizard.c:1598
+msgid "Client SSL certificate (optional)"
+msgstr ""
+
+#: src/wizard.c:1389 src/wizard.c:1414 src/wizard.c:1541
msgid "<span weight=\"bold\">Server address:</span>"
msgstr ""
-#: src/wizard.c:1338
+#: src/wizard.c:1444
msgid "<span weight=\"bold\">Local mailbox:</span>"
msgstr ""
-#: src/wizard.c:1395
+#: src/wizard.c:1507
msgid "IMAP"
msgstr ""
-#: src/wizard.c:1415
+#: src/wizard.c:1527
msgid "<span weight=\"bold\">Server type:</span>"
msgstr ""
-#: src/wizard.c:1426
+#: src/wizard.c:1538
msgid ""
"You can specify the port number by appending it at the end: \"mail.example."
"com:110\""
msgstr ""
-#: src/wizard.c:1440
+#: src/wizard.c:1551
msgid "<span weight=\"bold\">Username:</span>"
msgstr ""
-#: src/wizard.c:1455
+#: src/wizard.c:1566
msgid "Password:"
msgstr ""
-#: src/wizard.c:1470
+#: src/wizard.c:1581
msgid "Use SSL to connect to receiving server"
msgstr ""
-#: src/wizard.c:1488
+#: src/wizard.c:1632
msgid "IMAP server directory:"
msgstr ""
-#: src/wizard.c:1497
+#: src/wizard.c:1641
msgid "Show only subscribed folders"
msgstr ""
-#: src/wizard.c:1505
+#: src/wizard.c:1649
msgid ""
"<span weight=\"bold\">Warning: this version of Claws Mail\n"
"has been built without IMAP support.</span>"
msgstr ""
-#: src/wizard.c:1625
+#: src/wizard.c:1769
msgid "Claws Mail Setup Wizard"
msgstr ""
-#: src/wizard.c:1657
+#: src/wizard.c:1802
msgid "Welcome to Claws Mail"
msgstr ""
-#: src/wizard.c:1665
+#: src/wizard.c:1810
msgid ""
"Welcome to the Claws Mail setup wizard.\n"
"\n"
@@ -13770,32 +13241,33 @@ msgid ""
"five minutes."
msgstr ""
-#: src/wizard.c:1688
+#: src/wizard.c:1833
msgid "About You"
msgstr ""
-#: src/wizard.c:1696 src/wizard.c:1711 src/wizard.c:1726 src/wizard.c:1742
+#: src/wizard.c:1841 src/wizard.c:1856 src/wizard.c:1871 src/wizard.c:1887
msgid "Bold fields must be completed"
msgstr ""
-#: src/wizard.c:1703
+#: src/wizard.c:1848
msgid "Receiving mail"
msgstr ""
-#: src/wizard.c:1718
+#: src/wizard.c:1863
msgid "Sending mail"
msgstr ""
-#: src/wizard.c:1734
+#: src/wizard.c:1879
msgid "Saving mail on disk"
msgstr ""
-#: src/wizard.c:1750
+#: src/wizard.c:1895
msgid "Configuration finished"
msgstr ""
-#: src/wizard.c:1758
+#: src/wizard.c:1903
msgid ""
"Claws Mail is now ready.\n"
"Click Save to start."
msgstr ""
+
